Merge pull request #5789 from grom72/test-sh-disable

Use dedicated DISABLED() function to disable tests in bash test framework
pmem · Jul 13, 2023 · 16f472e · 16f472e
2 parents f0815d4 + dec6620
commit 16f472e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/src/test/obj_sync/DISABLE_TEST2 → src/test/obj_sync/TEST2 b/src/test/obj_sync/DISABLE_TEST2 → src/test/obj_sync/TEST2
@@ -6,12 +6,12 @@
 # src/test/obj_sync/TEST2 -- unit test for PMEM-resident locks
 #
 
-# XXX disable the test for 'helgrind'
-# until https://github.com/pmem/pmdk/issues/5646 is fixed
-# by adding the prefix DISABLE_ to the script name.
-
 . ../unittest/unittest.sh
 
+# XXX disable the test for 'helgrind'
+# until https://github.com/pmem/pmdk/issues/5646 is fixed.
+DISABLED
+
 require_test_type medium
 
 require_fs_type none

diff --git a/src/test/obj_sync/DISABLE_TEST5 → src/test/obj_sync/TEST5 b/src/test/obj_sync/DISABLE_TEST5 → src/test/obj_sync/TEST5
@@ -6,12 +6,12 @@
 # src/test/obj_sync/TEST5 -- unit test for PMEM-resident locks
 #
 
-# XXX disable the test for 'drd'
-# until https://github.com/pmem/pmdk/issues/5646 is fixed
-# by adding the prefix DISABLE_ to the script name.
-
 . ../unittest/unittest.sh
 
+# XXX disable the test for 'drd'
+# until https://github.com/pmem/pmdk/issues/5646 is fixed.
+DISABLED
+
 require_test_type medium
 
 require_fs_type none

diff --git a/src/test/obj_sync/DISABLE_TEST6 → src/test/obj_sync/TEST6 b/src/test/obj_sync/DISABLE_TEST6 → src/test/obj_sync/TEST6
@@ -6,12 +6,12 @@
 # src/test/obj_sync/TEST6 -- unit test for PMEM-resident locks
 #
 
-# XXX disable the test for 'helgrind'
-# until https://github.com/pmem/pmdk/issues/5646 is fixed
-# by adding the prefix DISABLE_ to the script name.
-
 . ../unittest/unittest.sh
 
+# XXX disable the test for 'helgrind'
+# until https://github.com/pmem/pmdk/issues/5646 is fixed.
+DISABLED
+
 require_test_type medium
 
 require_fs_type none

diff --git a/src/test/unittest/unittest.sh b/src/test/unittest/unittest.sh
@@ -83,6 +83,10 @@ function interactive_green() {
 	interactive_color 2 "$@"
 }
 
+function interactive_yellow() {
+	interactive_color 3 "$@"
+}
+
 function verbose_msg() {
 	if [ "$UNITTEST_LOG_LEVEL" -ge 2 ]; then
 		echo "$*"
@@ -1902,6 +1906,18 @@ function pass() {
 	fi
 }
 
+#
+# DISABLED -- print a message that the test has been intentionally disabled
+#	      and abandon test execution
+#
+function DISABLED() {
+	msg=$(interactive_yellow STDOUT "DISABLED")
+	if [ "$UNITTEST_LOG_LEVEL" -ge 1 ]; then
+		echo -e "$UNITTEST_NAME: $msg ($TEST/$REAL_FS/$BUILD$MCSTR$PROV$PM)"
+	fi
+	exit 0
+}
+
 # Length of pool file's signature
 SIG_LEN=8