Tweak virtual changer scripts

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

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 040718798082bb2b1a2e5ebd86d79ef1bb710f7b..3aa8a194ae2b978acf8d1824f5f9762199a309dd 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -10,27 +10,27 @@ JobName="bextract"
 
 scripts/cleanup
 scripts/copy-test-confs
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName 
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-label storage=File1 volume=TestVolume001
-label storage=File1 volume=TestVolume002
+@$out ${cwd}/tmp/log1.out
+label storage=File1 volume=TestVolume001 pool=Default
+label storage=File1 volume=TestVolume002 pool=Default
 update Volume=TestVolume001 MaxVolBytes=3000000
 @#setdebug level=400 dir
-@#setdebug level=400 storage=File1
+setdebug level=400 storage=File1
 run job=$JobName storage=File1 yes
 wait
 messages
 @# 
-@# now build the bsr file
+@# now build the bsr file but do not restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done
 no
 wait
@@ -44,9 +44,13 @@ check_for_zombie_jobs storage=File1
 stop_bacula
 
 mkdir -p ${cwd}/tmp/bacula-restores
-bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null
+if test "$debug" -eq 1 ; then
+  $bin/bextract -v -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores                
+else
+  $bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null
+fi
 rstat=$?
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null
 bstat=$?
 check_restore_diff
 end_test