Improve run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index aa344a62ead9c57903a7aa9d09519fd2dd835700..7ab316c88151bd309c0160b60b394f60ef7b823a 100755 (executable)
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -7,6 +7,7 @@ DOCTEST=0
 UNITTEST=0
 INTEGRATION=0
 FAILURES=0
+TESTS_RUN=0
 
 dup() {
     if [ $# -ne 2 ]; then
@@ -101,6 +102,7 @@ if [ ${DOCTEST} -eq 1 ]; then
             else
                 OUT=$( python3 ${doctest} 2>&1 )
             fi
+            TESTS_RUN=$((TESTS_RUN+1))
             FAILED=$( echo "${OUT}" | grep '\*\*\*Test Failed\*\*\*' | wc -l )
             if [ $FAILED == 0 ]; then
                 echo "OK"
@@ -127,6 +129,7 @@ if [ ${UNITTEST} -eq 1 ]; then
             FAILURES=$((FAILURES+1))
             FAILED_TESTS="${FAILED_TESTS},${BASE} (python3 ${test})"
         fi
+        TESTS_RUN=$((TESTS_RUN+1))
     done
 fi
 
@@ -144,6 +147,7 @@ if [ ${INTEGRATION} -eq 1 ]; then
             FAILURES=$((FAILURES+1))
             FAILED_TESTS="${FAILED_TESTS},${BASE} (python3 ${test})"
         fi
+        TESTS_RUN=$((TESTS_RUN+1))
     done
 fi
 
@@ -151,7 +155,7 @@ if [ ${COVERAGE} -eq 1 ]; then
     make_header "Code Coverage Report" "${GREEN}"
     coverage report --omit=config-3.8.py --sort=-cover
     echo
-    echo "To reproduce this report without run-running the tests, invoke:"
+    echo "Note: to recall this report without run-running the tests, invoke:"
     echo
     echo "    $ coverage report --omit=config-3.8.py --sort=-cover"
     echo
@@ -161,14 +165,14 @@ if [ ${FAILURES} -ne 0 ]; then
     FAILED_TESTS=$(echo ${FAILED_TESTS} | sed 's/^,/__/g')
     FAILED_TESTS=$(echo ${FAILED_TESTS} | sed 's/,/\n__/g')
     if [ ${FAILURES} -eq 1 ]; then
-        echo -e "${RED}There was ${FAILURES} failure:"
+        echo -e "${RED}There was ${FAILURES}/${TESTS_RUN} failure:"
     else
-        echo -e "${RED}There were ${FAILURES} failures:"
+        echo -e "${RED}There were ${FAILURES}/${TESTS_RUN} failures:"
     fi
     echo "${FAILED_TESTS}"
     echo -e "${NC}"
     exit ${FAILURES}
 else
-    echo -e "${BLACK}${ON_GREEN}Everything looks good.${NC}"
+    echo -e "${BLACK}${ON_GREEN}All (${TESTS_RUN}) test(s) passed.${NC}"
     exit 0
 fi