Merge branch 'master' into basejobv3

[bacula/bacula] / regress / scripts / check_for_zombie_jobs

diff --git a/regress/scripts/check_for_zombie_jobs b/regress/scripts/check_for_zombie_jobs
index e2a7e6ffa0cc2ade95cd9e9dd4394db9f9e76a2e..6aec189173c0564e0b7777aae421e624e2c8b78e 100755 (executable)
--- a/regress/scripts/check_for_zombie_jobs
+++ b/regress/scripts/check_for_zombie_jobs
@@ -4,65 +4,83 @@
 # Also scan logs for ERROR messages
 #
 
+. ./config
+
 # check_for_zombie_jobs storage=STORAGE [client=localhost-fd]
 
 if [ $# = 2 ] ; then
     client="$2"
 else 
-    client="client"
+    client=${HOST}-fd
 fi
 
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
-@output tmp/dir.out
+${bin}/bconsole -c ${scripts}/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+@output ${tmp}/dir.out
 status dir
-@output tmp/fd.out
-status $client
-@output tmp/sd.out
+@output ${tmp}/fd.out
+status client=${client}
+@output ${tmp}/sd.out
 status $1
 @output
 quit
 END_OF_DATA
-grep "No Jobs running." tmp/dir.out 2>&1 >/dev/null
+
+export zstat
+grep "No Jobs running." ${tmp}/dir.out 2>&1 >/dev/null
 if [ $? != 0 ] ; then
   echo " "
   echo "  !!!! Zombie Jobs in Director !!!!"
   echo "  !!!! Zombie Jobs in Director !!!!" >>test.out
   echo " "
+  zstat=1
+  exit 1
 fi
-grep "No Jobs running." tmp/fd.out 2>&1 >/dev/null
+grep "No Jobs running." ${tmp}/fd.out 2>&1 >/dev/null
 if [ $? != 0 ] ; then
   echo " "
   echo "  !!!! Zombie Jobs in File daemon !!!!"
   echo "  !!!! Zombie Jobs in File daemon !!!!" >>test.out
   echo " "
+  zstat=1
+  exit 1
 fi
-grep "No Jobs running." tmp/sd.out 2>&1 >/dev/null
+grep "No Jobs running." ${tmp}/sd.out 2>&1 >/dev/null
 if [ $? != 0 ] ; then
   echo " "
   echo "  !!!! Zombie Jobs in Storage daemon !!!!"
   echo "  !!!! Zombie Jobs in Storage daemon !!!!" >>test.out
   echo " "
+  zstat=1
+  exit 1
 fi
-grep "ERROR" tmp/log*.out 2>&1 >/dev/null
+grep "ERROR" ${tmp}/log*.out 2>&1 >/dev/null
 if [ $? = 0 ] ; then
   echo " "
   echo "  !!!! ERROR in log output !!!!"
   echo "  !!!! ERROR in log output !!!!" >>test.out
+  grep "ERROR" ${tmp}/log*.out
   echo " "
+  zstat=1
+  exit 1
 fi
-grep "Fatal Error" tmp/log*.out 2>&1 >/dev/null
+grep "Fatal Error" ${tmp}/log*.out 2>&1 >/dev/null
 if [ $? = 0 ] ; then
   echo " "
   echo "  !!!! Fatal Error in log output !!!!"
   echo "  !!!! Fatal Error in log output !!!!" >>test.out
+  grep "Fatal Error" ${tmp}/log*.out
   echo " "
+  zstat=1
+  exit 1
 fi
 
-grep "glibc detected" tmp/log*.out 2>&1 >/dev/null
+grep "glibc detected" ${tmp}/log*.out 2>&1 >/dev/null
 if [ $? = 0 ] ; then
   echo " "
   echo "  !!!! glibc detected Error in log output !!!!"
   echo "  !!!! glibc detected Error in log output !!!!" >>test.out
+  grep "glibc detected" ${tmp}/log*.out
   echo " "
+  zstat=1
+  exit 1
 fi
-