From 2b3ddf950c55aebf78d7286d6b9a25f9122ee118 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Thu, 9 Aug 2007 15:36:23 +0000 Subject: [PATCH] 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 --- regress/scripts/bacula-dir.conf.testrunscript.in | 4 ++-- regress/tests/runscript-test | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in index 705581bfad..522a7fde22 100644 --- 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 5085e25583..bd87c9d3a8 100755 --- 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=$? -- 2.39.5