Eliminate btape flush + tweak btape regression scripts

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index 2501d1f0e96d8dd84b5845cff1454cdf2a79f036..afd6a41610e169a9a406299103fd1a3d145ff954 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -2002,9 +2002,12 @@ static void fillcmd()
             now = time(NULL);
             (void)localtime_r(&now, &tm);
             strftime(buf1, sizeof(buf1), "%H:%M:%S", &tm);
+            Pmsg1(-1, _("%s\n"), buf1);
+#ifdef needed_xxx
             Pmsg1(-1, _("%s Flush block, write EOF\n"), buf1);
             flush_block(block, 0);
             dev->weof(1);
+#endif
          }
 
          /* Get out after writing 10 blocks to the second tape */

diff --git a/regress/scripts/bacula-sd-btape.conf.in b/regress/scripts/bacula-sd-btape.conf.in
index 08ea47ae74d888deed1408b6f1eec4388336b063..be843a609394c1cc1b14c45eccbedef3de8cd050 100644 (file)
--- a/regress/scripts/bacula-sd-btape.conf.in
+++ b/regress/scripts/bacula-sd-btape.conf.in
@@ -33,8 +33,16 @@ Director {
 #  same Name and MediaType. 
 #
 
+Autochanger {
+  Name = tape
+  Changer Device = @autochanger@
+  Changer Command ="@scriptdir@/@changer_script@ %c %o %S %a %d"
+  Device = Drive-0
+}
+
+
 Device {
-  Name = tape                      # 
+  Name = Drive-0                   # 
   Media Type = Tape
   Archive Device = @tape_drive@
   AutomaticMount = yes;               # when device opened, read it

diff --git a/regress/tests/btape-fill-full-changer b/regress/tests/btape-fill-full-changer
index e4671365cfc5537bfca90df23d146ffb8f3e12c4..1097dfe005214025d096c8c32fe5669ea4c93d22 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
@@ -21,7 +21,6 @@ start_test
 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 Drive-0 <<END_OF_DATA | tee ${cwd}/tmp/log1.out
 fill