X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Fbscan-fast-tape;h=7c68a78a3a3a2a6ea0bd4e60ecee790386d5bd0b;hb=9069d2fe01f419778c977cd4db47bb9e6b52cd02;hp=0040ede662dd1ce3d41e3b0a77649a95d903fdd0;hpb=00a8f284933e0d912ae9588924a6f9a68062bb46;p=bacula%2Fbacula

diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape
index 0040ede662..7c68a78a3a 100755
--- a/regress/tests/bscan-fast-tape
+++ b/regress/tests/bscan-fast-tape
@@ -5,13 +5,15 @@
 #   do a bscan and restore.
 #   It should require at least 4 different bsrs.
 #
-TestName="bscan-tape"
-JobName=bscantape
+TestName="bscan-fast-tape"
+JobName=bscanfasttape
 . scripts/functions
 
+require_tape_drive
+
 copy_tape_confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/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
@@ -20,11 +22,11 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out tmp/log1.out
-setdebug level=2 storage=DDS-4
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
+setdebug level=2 storage=tape
+label storage=tape volume=TestVolume001 slot=0 pool=Default
 run job=$JobName yes
 wait
 messages
@@ -32,7 +34,7 @@ quit
 END_OF_DATA
 
 echo "Starting Bacula tape writing"
-#bin/btape -c bin/bacula-sd.conf /dev/nst0 <<END_OF_DATA
+#$bin/btape -c bin/bacula-sd.conf /dev/nst0 <<END_OF_DATA
 #rewind
 #label
 #Test001
@@ -46,7 +48,7 @@ echo "Starting Bacula tape writing"
 #quit
 #END_OF_DATA
 #run_bacula
-#check_for_zombie_jobs storage=DDS-4
+#check_for_zombie_jobs storage=tape
 #stop_bacula
 echo "End writing tape"
 
@@ -61,7 +63,10 @@ cd ..
 
 echo "Begin attempt to read tape that crashes the system"
 echo "volume=TestVolume001" >tmp/bscan.bsr
-strace -o strace.new bin/bscan -d200 -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4
+
+bscan_libdbi
+
+strace -o strace.new $bin/bscan -d200 -w working $BSCANLIBDBI -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf tape
 exit
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -70,16 +75,15 @@ messages
 @# 
 @# now do a restore
 @#
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 rm -f  ${cwd}/build/src/lib/dummy