From 9a0280b7bc96a36be07b791bc2fb046819454de2 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Mon, 10 Sep 2012 21:41:56 +0200 Subject: [PATCH] regress: change /bin/sleep to sleep --- regress/scripts/bacula-dir-2client.conf.in | 2 +- regress/scripts/bacula-dir-fifo.conf.in | 2 +- regress/scripts/bacula-dir-strip.conf.in | 2 +- regress/scripts/bacula-dir-tape.conf.in | 2 +- regress/scripts/bacula-dir-vtape.conf.in | 2 +- regress/scripts/new-test-bacula-dir.conf.in | 4 ++-- regress/scripts/plugin-test-bacula-dir.conf.in | 2 +- regress/scripts/tls-auth-bacula-dir.conf.in | 4 ++-- regress/scripts/tls-bacula-dir.conf.in | 4 ++-- regress/tests/cancel-test | 14 +++++++------- regress/tests/maxdev-test | 2 +- regress/tests/vtape-bug-1288 | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/regress/scripts/bacula-dir-2client.conf.in b/regress/scripts/bacula-dir-2client.conf.in index daf7eeef57..2017991238 100644 --- a/regress/scripts/bacula-dir-2client.conf.in +++ b/regress/scripts/bacula-dir-2client.conf.in @@ -72,7 +72,7 @@ Job { Maximum Concurrent Jobs = 4 SpoolData = yes # Prefer Mounted Volumes = no - Client Run Before Job = "/bin/sleep 10" + Client Run Before Job = "sleep 10" } Job { diff --git a/regress/scripts/bacula-dir-fifo.conf.in b/regress/scripts/bacula-dir-fifo.conf.in index 0241e70265..a3be6ff647 100644 --- a/regress/scripts/bacula-dir-fifo.conf.in +++ b/regress/scripts/bacula-dir-fifo.conf.in @@ -52,7 +52,7 @@ Job { Maximum Concurrent Jobs = 4 SpoolData = yes # Prefer Mounted Volumes = no - Client Run Before Job = "/bin/sleep 120" + Client Run Before Job = "sleep 120" } Job { diff --git a/regress/scripts/bacula-dir-strip.conf.in b/regress/scripts/bacula-dir-strip.conf.in index 90ecc0e483..dffbbbaeb1 100644 --- a/regress/scripts/bacula-dir-strip.conf.in +++ b/regress/scripts/bacula-dir-strip.conf.in @@ -52,7 +52,7 @@ Job { Maximum Concurrent Jobs = 4 SpoolData = yes # Prefer Mounted Volumes = no - Client Run Before Job = "/bin/sleep 10" + Client Run Before Job = "sleep 10" } Job { diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in index 18494e9c4e..cf1096fb93 100644 --- a/regress/scripts/bacula-dir-tape.conf.in +++ b/regress/scripts/bacula-dir-tape.conf.in @@ -55,7 +55,7 @@ Job { Maximum Concurrent Jobs = 100 SpoolData = yes # Prefer Mounted Volumes = no - Client Run Before Job = "/bin/sleep 10" + Client Run Before Job = "sleep 10" Max Run Time = 30min } diff --git a/regress/scripts/bacula-dir-vtape.conf.in b/regress/scripts/bacula-dir-vtape.conf.in index 1d59ebf946..a4ebfc1036 100644 --- a/regress/scripts/bacula-dir-vtape.conf.in +++ b/regress/scripts/bacula-dir-vtape.conf.in @@ -43,7 +43,7 @@ Job { Maximum Concurrent Jobs = 10 SpoolData = yes # Prefer Mounted Volumes = no - Client Run Before Job = "/bin/sleep 2" + Client Run Before Job = "sleep 2" } Job { diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in index d0febef52c..82e6030a1f 100644 --- a/regress/scripts/new-test-bacula-dir.conf.in +++ b/regress/scripts/new-test-bacula-dir.conf.in @@ -169,7 +169,7 @@ Job { Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" - ClientRunBeforeJob = "/bin/sleep 5" + ClientRunBeforeJob = "sleep 5" Max Run Time = 30min } @@ -208,7 +208,7 @@ Job { Name = "bug621-job-1" Client = @hostname@-fd FileSet="Full Set" - ClientRunBeforeJob = "/bin/sleep 5" + ClientRunBeforeJob = "sleep 5" } Job { diff --git a/regress/scripts/plugin-test-bacula-dir.conf.in b/regress/scripts/plugin-test-bacula-dir.conf.in index 44e95f9098..db1badd96f 100644 --- a/regress/scripts/plugin-test-bacula-dir.conf.in +++ b/regress/scripts/plugin-test-bacula-dir.conf.in @@ -167,7 +167,7 @@ Job { Name = "bug621-job-1" Client = @hostname@-fd FileSet="Full Set" - ClientRunBeforeJob = "/bin/sleep 5" + ClientRunBeforeJob = "sleep 5" } Job { diff --git a/regress/scripts/tls-auth-bacula-dir.conf.in b/regress/scripts/tls-auth-bacula-dir.conf.in index d1651c585b..88d735ba56 100644 --- a/regress/scripts/tls-auth-bacula-dir.conf.in +++ b/regress/scripts/tls-auth-bacula-dir.conf.in @@ -108,7 +108,7 @@ Job { Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" - ClientRunBeforeJob = "/bin/sleep 5" + ClientRunBeforeJob = "sleep 5" } @@ -144,7 +144,7 @@ Job { Name = "bug621-job-1" Client = @hostname@-fd FileSet="Full Set" - ClientRunBeforeJob = "/bin/sleep 5" + ClientRunBeforeJob = "sleep 5" } Job { diff --git a/regress/scripts/tls-bacula-dir.conf.in b/regress/scripts/tls-bacula-dir.conf.in index 129f832384..0642823065 100644 --- a/regress/scripts/tls-bacula-dir.conf.in +++ b/regress/scripts/tls-bacula-dir.conf.in @@ -119,7 +119,7 @@ Job { Messages = Standard Pool = Default Write Bootstrap = "@working_dir@/NightlySave.bsr" - ClientRunBeforeJob = "/bin/sleep 5" + ClientRunBeforeJob = "sleep 5" } @@ -155,7 +155,7 @@ Job { Name = "bug621-job-1" Client = localhost-fd FileSet="Full Set" - ClientRunBeforeJob = "/bin/sleep 5" + ClientRunBeforeJob = "sleep 5" } Job { diff --git a/regress/tests/cancel-test b/regress/tests/cancel-test index 0ecfb8969e..f6167d6a00 100755 --- a/regress/tests/cancel-test +++ b/regress/tests/cancel-test @@ -48,9 +48,9 @@ Job { } Job { Name = RUN_ERR3 - ClientRunBeforeJob="/bin/sleep 10" + ClientRunBeforeJob="sleep 10" RunScript { - Command = "/bin/sleep 600" + Command = "sleep 600" RunsWhen = After RunsOnFailure = Yes } @@ -58,9 +58,9 @@ Job { } Job { Name = RUN_ERR4 - ClientRunBeforeJob="/bin/sleep 10" + ClientRunBeforeJob="sleep 10" RunScript { - Command = "/bin/sleep 40" + Command = "sleep 40" RunsWhen = After RunsOnFailure = Yes } @@ -319,20 +319,20 @@ check_duration ${cwd}/tmp/logfile5.out 30 check_duration ${cwd}/tmp/logfile6.out 30 check_duration ${cwd}/tmp/logfile8.out 550 lt -grep 'ClientAfterJob "/bin/sleep 600"' tmp/logfile8.out >/dev/null +grep 'ClientAfterJob "sleep 600"' tmp/logfile8.out >/dev/null if [ $? -ne 0 ]; then print_debug "Can't find ClientAfterJob" bstat=2 fi check_duration ${cwd}/tmp/logfile9.out 550 lt -grep 'ClientAfterJob "/bin/sleep 600"' tmp/logfile9.out >/dev/null +grep 'ClientAfterJob "sleep 600"' tmp/logfile9.out >/dev/null if [ $? -ne 0 ]; then print_debug "Can't find ClientAfterJob" bstat=2 fi -grep 'ClientAfterJob "/bin/sleep 40"' tmp/logfile10.out >/dev/null +grep 'ClientAfterJob "sleep 40"' tmp/logfile10.out >/dev/null if [ $? -ne 0 ]; then print_debug "Can't find ClientAfterJob" bstat=2 diff --git a/regress/tests/maxdev-test b/regress/tests/maxdev-test index ceede3836f..981019fa6a 100755 --- a/regress/tests/maxdev-test +++ b/regress/tests/maxdev-test @@ -14,7 +14,7 @@ require_vtape scripts/cleanup scripts/copy-tape-confs -sed 's:Job {:Job { ClientRunBeforeJob = "/bin/sleep 5":' \ +sed 's:Job {:Job { ClientRunBeforeJob = "sleep 5":' \ $rscripts/bacula-dir-vtape.conf > $conf/bacula-dir.conf sed 's/VTape/VTape; maximum concurrent jobs = 3/' \ $rscripts/bacula-sd-vtape.conf | \ diff --git a/regress/tests/vtape-bug-1288 b/regress/tests/vtape-bug-1288 index 757cdfd4d1..ef7eedaf3b 100755 --- a/regress/tests/vtape-bug-1288 +++ b/regress/tests/vtape-bug-1288 @@ -26,7 +26,7 @@ sed -i 's/Pool {/Pool { LabelFormat = "vol"/' bin/bacula-dir.conf sed -i 's/SpoolData = yes/SpoolData = no/' bin/bacula-dir.conf sed -i 's/Maximum Volume Size = 30M//' bin/bacula-sd.conf sed -i 's/Maximum File Size = 7M//' bin/bacula-sd.conf -sed -i 's!Client Run Before Job = "/bin/sleep 2"!!' bin/bacula-dir.conf +sed -i 's!Client Run Before Job = "sleep 2"!!' bin/bacula-dir.conf scripts/prepare-fake-autochanger echo "${cwd}/build" >${cwd}/tmp/file-list -- 2.39.5