ebl Add multiple command test for runscript

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

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index b6a4042d56d298a8ee517ff0cbaeee4350c89fce..b2cab97a709c3d20046a72c413f6d8d05cbd4602 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -57,6 +57,13 @@ Job {
   ClientRunBeforeJob = "/bin/echo ClientRunBeforeJob"
   Run After Job = "/bin/echo RunAfterJob"
   ClientRunAfterJob = "/bin/echo ClientRunAfterJob"
+  RunScript {
+    Command = "/bin/echo ClientRunBefore1"
+    Command = "/bin/echo ClientRunBefore2"
+    Command = "/bin/echo ClientRunBefore3"
+    Command = "/bin/echo ClientRunBefore4"
+    RunsWhen = Before
+  }
 }
 
 Job {
@@ -105,6 +112,7 @@ Job {
   }
   RunScript {
     Command = "/bin/false RUN_FD_FAILED3"
+    Command = "/bin/false RUN_FD_FAILED4"
     failjobonerror = yes
     RunsWhen = Before
   }
@@ -171,6 +179,7 @@ Job {
     Console = "purge volume=TestVolume001 yes"
     Console = "st dir"
     RunsWhen = Before
+    failjobonerror = no
     runsonclient = no
   }
 }

diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index cd53433e15c1e2c3c175ed0defc5c3990356a430..144a9276a01b710f7013e5542c90756c2beb0d02 100755 (executable)
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -76,7 +76,12 @@ grep 'shell command: run ClientAfterJob "/bin/echo ClientRunAfterJob' ${cwd}/tmp
 c=$?
 grep 'shell command: run AfterJob "/bin/echo RunAfterJob' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
 d=$?
-if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 ]
+grep 'ClientRunBefore1' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null && \
+grep 'ClientRunBefore2' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null && \
+grep 'ClientRunBefore3' ${cwd}/tmp/RUN_ALL_OK.log >/dev/null
+e=$?
+
+if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 ]
 then
    [ "$debug" = 1 ] && echo RUN_ALL_OK ok
 else
@@ -126,7 +131,9 @@ grep 'shell command: run AfterJob "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_
 d=$?
 grep  '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
 e=$?
-if [ $a = 0 -a $b != 0 -a $c = 0 -a $d = 0 -a $e = 0 ]
+grep 'RUN_FD_FAILED4' ${cwd}/tmp/RUN_FD_FAILED2.log >/dev/null
+f=$?
+if [ $a = 0 -a $b != 0 -a $c = 0 -a $d = 0 -a $e = 0 -a $f != 0 ]
 then
    [ "$debug" = 1 ] && echo RUN_FD_FAILED ok
 else