From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 20 Jun 2008 18:33:17 +0000 (+0000)
Subject: Make pretest portable
X-Git-Tag: Release-7.0.0~4414
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=36d0a8d423b015e47da6572fd969957bad8882fe;p=bacula%2Fbacula

Make pretest portable

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7199 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/scripts/pretest b/regress/scripts/pretest
index 39f58d8e9f..369b2a7506 100755
--- a/regress/scripts/pretest
+++ b/regress/scripts/pretest
@@ -19,20 +19,29 @@ 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