Update

[bacula/bacula] / regress / scripts / pretest

diff --git a/regress/scripts/pretest b/regress/scripts/pretest
index 39f58d8e9f3d206cc9566bc205840cbb1f93528a..b02fb2ba4c83ea104a8f6f6cf84f1f7943de77c7 100755 (executable)
--- a/regress/scripts/pretest
+++ b/regress/scripts/pretest
@@ -19,26 +19,38 @@ END_OF_DATA
 
 start_test
 
-if ! run_bacula
-then
-   echo "error: bconsole error"
+run_bacula
+if [ $? -ne 0 ]; 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
+bin/bacula-ctl-dir status >/dev/null
+if [ $? -ne 0 ]; then
+   echo "Error: bacula-dir failed to start"
+   error=1
+fi
+
+bin/bacula-ctl-fd status >/dev/null
+if [ $? -ne 0 ]; then
+   echo "Error: bacula-fd failed to start"
+   error=1
+fi
+
+bin/bacula-ctl-sd status >/dev/null
+if [ $? -ne 0 ]; then
+   echo "Error: bacula-sd failed to start"
+   error=1
+fi
 
 stop_bacula
 
-export dstat=0
-export bstat=$error
-export rstat=0
+dstat=0
+bstat=$error
+rstat=0
+export dstat
+export bstat
+export rstat
 
 end_test