Skip to content

Commit 6b9c4a6

Browse files
committed
Treat non-empty error files as error.
Fix spacing.
1 parent 8072de3 commit 6b9c4a6

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

tests/run.sh

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,25 @@ case "$MODE" in
4141
ret=$?
4242
if [[ $ret -ne 0 ]];
4343
then
44-
echo -e $DRIVER$TEST "\e[0;31mTIMEOUT or ERROR\e[0m";
45-
cat $RESULT_DIR/$DRIVER$TEST.err;
44+
echo -e $DRIVER$TEST "\e[0;31mTIMEOUT or ERROR\e[0m";
45+
cat $RESULT_DIR/$DRIVER$TEST.err;
4646
echo "1" >> testresults;
4747
else
48-
if cmp -s $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
49-
then
50-
echo -e $DRIVER$TEST "\e[0;32mOK\e[0m";
51-
echo "0" >> testresults;
52-
else
53-
echo -e $DRIVER$TEST "\e[0;31mFAILED\e[0m";
54-
diff $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
55-
echo "1" >> testresults;
56-
fi;
57-
fi;
48+
if [[ -s $RESULT_DIR/$DRIVER$TEST.err ]]
49+
then
50+
echo -e $DRIVER$TEST "\e[0;31mERROR\e[0m";
51+
cat $RESULT_DIR/$DRIVER$TEST.err;
52+
echo "1" >> testresults;
53+
elif cmp -s $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
54+
then
55+
echo -e $DRIVER$TEST "\e[0;32mOK\e[0m";
56+
echo "0" >> testresults;
57+
else
58+
echo -e $DRIVER$TEST "\e[0;31mFAILED\e[0m";
59+
diff $RESULT_DIR/$DRIVER$TEST.ref $RESULT_DIR/$DRIVER$TEST.out;
60+
echo "1" >> testresults;
61+
fi;
62+
fi;
5863
;;
5964
"REF")
6065
./$BUILD_DIR/$LAUNCH_NAME > $RESULT_DIR/$DRIVER$TEST.ref

0 commit comments

Comments
 (0)