Updates

[bacula/bacula] / regress / tests / concurrent-jobs-test

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 1f4deeb5926db9725f5a4d16fe4ee625f587812f..dafddc588081cf8707ad461b937c9877b2ef8d0d 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -25,12 +25,12 @@ echo "largefile created"
 
 echo " "
 echo " "
-echo " === Starting concurrent-jobs-test  ==="
-echo " === Starting concurrent-jobs-test  ===" >>working/log
+echo " === Starting concurrent-jobs-test at `date +%R:%S` ==="
+echo " === Starting concurrent-jobs-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -58,9 +58,9 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
 
 bin/bacula stop 2>&1 >/dev/null
-grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then