Commit libdbi changes

[bacula/bacula] / regress / tests / bscan-tape

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index 644db627a26d56cff4cd1ffabe0b087a75e7bc30..71341697e491e81b2b39f42cc0ddb09681dfb5bc 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -9,12 +9,14 @@ TestName="bscan-tape"
 JobName=bscantape
 . scripts/functions
 
+require_tape_drive
+
 copy_tape_confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >tmp/file-list
 
-cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+cp ${cwd}/bin/bacula-sd.conf tmp/1
+sed "s%# Maximum File Size%  Maximum File Size%" tmp/1 >${cwd}/bin/bacula-sd.conf
 
 change_jobname NightlySave $JobName
 start_test
@@ -23,14 +25,11 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 estimate job=$JobName listing
 estimate job=$JobName listing
-estimate job=$JobName listing
 messages
 @$out tmp/log1.out
 setdebug level=2 storage=DDS-4
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
-run job=$JobName yes
-wait
-run job=$JobName level=Full yes
+run job=$JobName level=Full yes 
 wait
 run job=$JobName level=Full yes
 wait
@@ -59,7 +58,7 @@ messages
 quit
 END_OF_DATA
 
-run_bacula
+run_bconsole
 scripts/check_for_zombie_jobs storage=DDS-4
 
 echo "Backup 2 done"
@@ -68,17 +67,8 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
-messages
-@$out tmp/log1.out
-run job=$JobName level=Incremental yes
-wait
-messages
-quit
-END_OF_DATA
 
-run_bacula
+run_bconsole
 scripts/check_for_zombie_jobs storage=DDS-4
 
 echo "Backup 3 done"
@@ -88,19 +78,10 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
-messages
-@$out tmp/log1.out
-run job=$JobName level=Incremental yes
-wait
-messages
-quit
-END_OF_DATA
-
-run_bacula
 
+run_bconsole
 scripts/check_for_zombie_jobs storage=DDS-4
+
 stop_bacula
 
 echo "Backup 4 done"
@@ -127,7 +108,7 @@ messages
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+restore where=tmp/bacula-restores select all storage=DDS-4 done
 yes
 wait
 messages