From 77b5f1c15b8793c48f1f3752a5f32e5b8b786836 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Fri, 18 Jun 2021 10:24:59 +0200
Subject: [PATCH] Returned to working version

---
 tests/test_versions/Makefile  | 2 +-
 tests/test_versions/debug.txt | 9 ---------
 tests/test_versions/test.sh   | 8 +++++---
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 tests/test_versions/debug.txt

diff --git a/tests/test_versions/Makefile b/tests/test_versions/Makefile
index d757fcc6..8bebd1c7 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 3edef119..00000000
--- 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 c43ff763..cdbf7aae 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
-- 
GitLab