Add Thomas Mueller's pretest code

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7165 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/CTestCustom.cmake b/regress/CTestCustom.cmake
index f04f7214cbaf61e8b91afb1c7439370ee02bf2fc..377121f3c37a02ad42954bc975c5fb0e1966b4a7 100644 (file)
--- a/regress/CTestCustom.cmake
+++ b/regress/CTestCustom.cmake
@@ -9,3 +9,5 @@ SET(CTEST_CUSTOM_ERROR_EXCEPTION
 
 SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 10000)
 SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1048576)
+
+SET(CTEST_CUSTOM_PRE_TEST scripts/pretest)

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 61d6eb499901cad011a3caa7dd7063fb3ea3d85b..46c2876fcc075408c37d6f52f04b3e5ab35eb79f 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -98,9 +98,11 @@ run_bacula()
      bin/bacula-ctl-fd start
      bin/bacula-ctl-dir start
      cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+     return $?
    else
      bin/bacula start 2>&1 >/dev/null
      cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+     return $?
    fi
 }
 

diff --git a/regress/scripts/pretest b/regress/scripts/pretest
new file mode 100755 (executable)
index 0000000..39f58d8
--- /dev/null
+++ b/regress/scripts/pretest
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+#  Test if daemons start
+#
+
+TestName="pretest"
+JobName=backup
+error=0
+
+. scripts/functions
+
+copy_test_confs
+
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+messages
+quit
+END_OF_DATA
+
+start_test
+
+if ! run_bacula
+then
+   echo "error: bconsole error"
+   error=1
+fi
+
+for i in bacula-fd bacula-sd bacula-dir
+do
+   if ! ps -C $i >/dev/null
+   then
+      echo "error: $i not running"
+      error=1
+   fi
+done
+
+stop_bacula
+
+export dstat=0
+export bstat=$error
+export rstat=0
+
+end_test
+
+exit $error