diff --git a/.travis.yml b/.travis.yml index b460ad05b049a6fa5ddd043a7682d81f3abc947f..72970bc1e0d75e08ded92062c78e40f53fd5dc57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,7 +163,7 @@ matrix: cd ${TRAVIS_BUILD_DIR}/tests - ./test-all.sh $TRAVIS_EVENT_TYPE + ./test-all.sh $TRAVIS_EVENT_TYPE COVER TEST_RESULT=$? diff --git a/tests/test-all.sh b/tests/test-all.sh index 93bfa7a4263e70f01ce206efa4a9e8a8b6674fc8..e58a6f51327c066b526d0332a2c7b1678d7cc4d4 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -21,11 +21,12 @@ fi echo -e "${GREEN} ### Total $totalSuccess TSIM case(s) succeed! ### ${NC}" totalFailed=`grep 'failed\|fault' out.txt | wc -l` -echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" +# echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" if [ "$totalFailed" -ne "0" ]; then -# echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" - exit $totalFailed + echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}" + +# exit $totalFailed fi echo "### run Python script ###" @@ -46,6 +47,7 @@ fi totalPyFailed=`grep 'failed\|fault' pytest-out.txt | wc -l` if [ "$totalPyFailed" -ne "0" ]; then echo -e "${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}" - exit $totalPyFailed +# exit $totalPyFailed fi +exit $(($totalFailed + $totalPyFailed))