ebl update and make it working

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

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index d61a8688ac0007d6d630b5eccdb7f996d0f1daf1..d4ab848716fd5676ee0761d34a3edc3f05065b96 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 ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
+sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
+
 change_jobname Client1 $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/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,7 +52,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out  
+@$out ${cwd}/tmp/log2.out  
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
@@ -56,10 +65,10 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @#setdebug level=100 storage=File
 run job=$JobName yes
 wait
@@ -67,7 +76,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out  
+@$out ${cwd}/tmp/log2.out  
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait