Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula

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

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 80085b326593e2897b84d894eda872b5d9607f75..3aa8a194ae2b978acf8d1824f5f9762199a309dd 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -19,11 +19,11 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=File1 volume=TestVolume001
-label storage=File1 volume=TestVolume002
+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
@@ -45,9 +45,9 @@ stop_bacula
 
 mkdir -p ${cwd}/tmp/bacula-restores
 if test "$debug" -eq 1 ; then
-  bin/bextract -v -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores                
+  $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
+  $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" ${cwd}/tmp/log1.out 2>&1 >/dev/null