Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / btape-test-changer

diff --git a/regress/tests/btape-test-changer b/regress/tests/btape-test-changer
index 1388559ecc18ccaf61fe29bfa19bc9bc5d0c5c32..fe240ed6e9ca2edd02bd8e7b31c238a1a389e3f8 100755 (executable)
--- a/regress/tests/btape-test-changer
+++ b/regress/tests/btape-test-changer
@@ -17,13 +17,17 @@ change_jobname $JobName
 start_test
 
 if test "$debug" -eq 1 ; then
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA | tee ${cwd}/tmp/log1.out
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA | tee ${cwd}/tmp/log1.out
+capcmd
+speed
 test
 yes
 quit
 END_OF_DATA
 else
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA >${cwd}/tmp/log1.out 2>&1
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA | tee ${cwd}/tmp/log1.out
+capcmd
+speed
 test
 yes
 quit
@@ -46,13 +50,13 @@ cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -e 's%64512%262144%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
 if test "$debug" -eq 1 ; then
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA | tee ${cwd}/tmp/log2.out
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA | tee ${cwd}/tmp/log2.out
 test
 yes
 quit
 END_OF_DATA
 else
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA >${cwd}/tmp/log2.out 2>&1
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA >${cwd}/tmp/log2.out 2>&1
 test
 yes
 quit