Reorganize regex code

[bacula/bacula] / regress / tests / btape-fill-full-changer

diff --git a/regress/tests/btape-fill-full-changer b/regress/tests/btape-fill-full-changer
index 3d892f7ea1cec79802bda1b22a37bc892a87b2d9..e778c68fb28f6b6882e7a4e45f5ef0143ade65e1 100755 (executable)
--- a/regress/tests/btape-fill-full-changer
+++ b/regress/tests/btape-fill-full-changer
@@ -10,7 +10,7 @@ require_tape_drive
 require_autochanger
 
 scripts/cleanup
-scripts/copy-2tape-confs
+scripts/copy-btape-confs
 
 change_jobname $JobName
 start_test
@@ -20,17 +20,21 @@ start_test
 #
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -e 's%64512%262144%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
-
+#
+# Limit Volume size for debugging without waiting too long
+#
+# cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
+# sed -e 's%# MaximumVolumeSize = 400M%  MaximumVolumeSize = 400M%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
 if test "$debug" -eq 1 ; then
-   $bin/btape -c bin/bacula-sd.conf DDS-4 <<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
 fill
 m
 
 quit
 END_OF_DATA
 else
-   $bin/btape -c bin/bacula-sd.conf DDS-4 <<END_OF_DATA >${cwd}/tmp/log1.out 2>&1
+   $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA >${cwd}/tmp/log1.out 2>&1
 fill
 m
 
@@ -38,7 +42,7 @@ quit
 END_OF_DATA
 fi
 
-grep "^The last block on the tape matches\. Test succeeded\." ${cwd}/tmp/log1.out >/dev/null 2>&1
+grep "^The last block on the second tape matches\. Test succeeded\." ${cwd}/tmp/log1.out >/dev/null 2>&1
 if [ $? != 0 ] ; then
    echo " "
    echo " "