From 933643b60e85396984dcc7933231059c1a924102 Mon Sep 17 00:00:00 2001 From: Axel Fagerstedt Date: Thu, 28 Feb 2013 14:23:41 +0100 Subject: Fix hanging expanded ashmemtest --- linaro-android-kernel-tests.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/linaro-android-kernel-tests.sh b/linaro-android-kernel-tests.sh index aa4e387..4ab6f05 100755 --- a/linaro-android-kernel-tests.sh +++ b/linaro-android-kernel-tests.sh @@ -13,21 +13,21 @@ run_ashmemtest_expanded() for f in $FILES do - BASENAME=`basename $f` + BASENAME=${f##*/} TESTNAME="${BASENAME%.*}" - echo "running $TESTNAME" - OUTPUT=`ashmemtest-expanded $f` - EXPECTED_OUTPUT=`cat $DIR/$TESTNAME.out` + ashmemtest-expanded $f &> $DIR/tmp.out - if [ "$OUTPUT" == "$EXPECTED_OUTPUT" ]; then - echo $OUTPUT + diff $DIR/tmp.out $DIR/$TESTNAME.out > /dev/null + if [ $? -eq 0 ]; then + cat $DIR/tmp.out echo "[$TESTNAME]: test passed" else - echo $OUTPUT + cat $DIR/tmp.out echo "[$TESTNAME]: test failed" fi + rm $DIR/tmp.out done } @@ -60,7 +60,6 @@ run_logger_test() done } - run_ashmemtest run_ashmemtest_expanded -- cgit v1.2.3