diff --git a/tests/test_versions/Makefile b/tests/test_versions/Makefile index d757fcc687597671fa3a2c5b9145309614997cd0..8bebd1c7dc24a69cb37af9a620fd2eef47bda0d1 100644 --- a/tests/test_versions/Makefile +++ b/tests/test_versions/Makefile @@ -4,7 +4,7 @@ default: test .PHONY: test test: check_env clean - @./test.sh debug.txt + @./test.sh test.txt .PHONY: check_env check_env: guard-EPICS_BASE guard-E3_REQUIRE_VERSION diff --git a/tests/test_versions/debug.txt b/tests/test_versions/debug.txt deleted file mode 100644 index 3edef11946d7eff32af9d0c6f5b45612c9d9e88d..0000000000000000000000000000000000000000 --- a/tests/test_versions/debug.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Basic set of tests. -# -# Note that the first entry is the requested test version (- means none requested) -# The second entry is what is expected to be loaded (- means it is expected to fail) -# The third and other entries are the versions to install. - - -# Only load exactly the given build number if specified. -0.0.1+0 - 0.0.1+1 diff --git a/tests/test_versions/test.sh b/tests/test_versions/test.sh index c43ff763605f0b94c253da26f438d2683dd1f3b1..cdbf7aae07047277f95b1cb6dd694f2a6f6d7a02 100755 --- a/tests/test_versions/test.sh +++ b/tests/test_versions/test.sh @@ -179,6 +179,8 @@ if [ -f "$TESTFILE" ]; then done < <(sed -e 's/[[:space:]]*#.*//; /^[[:space:]]*$/d' "$TESTFILE") fi -[ "$failed_tests" = 0 ] - -cat test.log \ No newline at end of file +if [ ! "$failed_tests" = 0 ]; then + echo -e "\033[31mFailing tests: $failed_tests\033[0m\n" >&2 + cat test.log + exit -1 +fi