regress: only enable tray-monitor-connection-test when traymon is build

Before, the test was renamed which leads to an error return value of the whole ctest run.
bareos · Dec 20, 2018 · 22a905a · 22a905a
1 parent f9b0601
commit 22a905a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/regress/DartTestfile.txt.in b/regress/DartTestfile.txt.in
@@ -1,4 +1,4 @@
-ADD_TEST(disk:tray-monitor-connection-test "@regressdir@/tests/tray-monitor-connection-test")
+#ADD_TEST(disk:tray-monitor-connection-test "@regressdir@/tests/tray-monitor-connection-test")
 ADD_TEST(disk:lan-addr-test "@regressdir@/tests/lan-addr-test")
 ADD_TEST(disk:lan-addr-test-passive "@regressdir@/tests/lan-addr-test-passive")
 ADD_TEST(disk:reload-test "@regressdir@/tests/reload-test")

diff --git a/regress/scripts/create_sed b/regress/scripts/create_sed
@@ -134,6 +134,7 @@ echo "s%@regress_gitbranch@%${regress_gitbranch}%g" >>${out}
 echo "s%@regress_gitrev@%${regress_gitrev}%g" >>${out}
 echo "s%@GCOV@%${GCOV}%g" >>${out}
 echo "s%@PERL@%${PERL}%g" >>${out}
-if [ -z ${TRAYMON} ] ; then
-  echo "s%tray-monitor-connection-test%tray-monitor-connection-test_disabled%g" >> ${out}
+
+if [ -n "${TRAYMON}" ] ; then
+  echo "s%#ADD_TEST(disk:tray-monitor-connection-test%ADD_TEST(disk:tray-monitor-connection-test%g" >> ${out}
 fi