ebl make runscript test ok for 2.2 release (hide #897)

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

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index 705581bfad7dd5ab399c036777b97c196b7d0de3..522a7fde22f34e507f53324f2639a896fc437724 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -98,12 +98,12 @@ Job {
 
   Run After Failed Job = "/bin/echo RunAfterFailedJob"
   RunScript {
-    Command = "/bin/echo touching /tmp/RUN_FD_FAILED"
+    Command = "/bin/echo touching @tmpdir@/RUN_FD_FAILED"
     RunsWhen = after
     RunsOnFailure = yes
   }
   RunScript {
-    Command = "/bin/touch /tmp/RUN_FD_FAILED"
+    Command = "/bin/touch @tmpdir@/RUN_FD_FAILED"
     RunsWhen = after
     RunsOnFailure = yes
   }

diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test
index 5085e25583ad3934806299eca8191e0aba50156c..bd87c9d3a853d96c22d2fdc6d087d53aed361d17 100755 (executable)
--- a/regress/tests/runscript-test
+++ b/regress/tests/runscript-test
@@ -11,6 +11,9 @@ copy_test_confs
 
 rm -f bin/bacula-dir.conf
 rm -f tmp/RUN*log
+rm -f tmp/RUN_FD_FAILED
+
+touch tmp/log1.out
 /bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf
 
 echo "${cwd}/build/po" >/tmp/file-list
@@ -94,7 +97,8 @@ grep 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' tmp/RUN_FD_F
 b=$?
 grep 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' tmp/RUN_FD_FAILED.log >/dev/null 2>&1
 c=$?
-grep 'touching' tmp/RUN_FD_FAILED.log >/dev/null 2>&1
+#grep 'touching' tmp/RUN_FD_FAILED.log >/dev/null 2>&1
+test -f tmp/RUN_FD_FAILED
 d=$?
 grep '*** Backup Error ***' tmp/RUN_FD_FAILED.log >/dev/null 2>&1
 e=$?