ebl make fileregexp-test working with git repository

[bacula/bacula] / regress / tests / backup-bacula-test

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 0815c38316630e96ac76638ddf4c295e2928a681..8cf65cf560e0a131a9319987aac548da629da633 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -10,15 +10,24 @@ JobName=backup
 scripts/cleanup
 scripts/copy-confs
 
+#
+# Zap out any schedule in default conf file so that
+#  it doesn't start during our test
+#
+outf="$tmp/sed_tmp"
+echo "s%  Schedule =%# Schedule =%g" >${outf}
+cp $scripts/bacula-dir.conf $tmp/1
+sed -f ${outf} $tmp/1 >$scripts/bacula-dir.conf
+
 change_jobname Client1 $JobName
 start_test
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+cat <<END_OF_DATA >$tmp/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out $tmp/log1.out
+setdebug level=100 storage=File
 label volume=TestVolume001 storage=File pool=Default
-@#setdebug level=100 storage=File
 run job=$JobName yes
 status storage=File
 status storage=File
@@ -43,8 +52,8 @@ messages
 @# 
 @# now do a restore
 @#
-@$out ${cwd}/tmp/log2.out  
-restore where=${cwd}/tmp/bacula-restores select all done
+@$out $tmp/log2.out  
+restore where=$tmp/bacula-restores select all done
 yes
 wait
 messages
@@ -56,10 +65,10 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+cat <<END_OF_DATA >$tmp/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out $tmp/log1.out
 @#setdebug level=100 storage=File
 run job=$JobName yes
 wait
@@ -67,8 +76,8 @@ messages
 @# 
 @# now do a restore
 @#
-@$out ${cwd}/tmp/log2.out  
-restore where=${cwd}/tmp/bacula-restores select all done
+@$out $tmp/log2.out  
+restore where=$tmp/bacula-restores select all done
 yes
 wait
 messages