X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-2tape;h=1ee97cd49c302f5c74d41557e22018a3a4c4ef0c;hb=d1b8404967060594684bb2448fde7f698b27396c;hp=6ed796897f4042479032c74fa96fdb0eee44939f;hpb=bd1975d9d3da8162240c6e2895d1a97a209c7c92;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 6ed796897f..1ee97cd49c 100755
--- a/regress/tests/incremental-2tape
+++ b/regress/tests/incremental-2tape
@@ -5,6 +5,17 @@
 #
 # This script uses the autochanger and two tapes
 #
+. config.out
+if test x${AUTOCHANGER} = x/dev/null ; then
+   echo "incremental-2tape test skipped. No autochanger."
+   exit
+fi
+debug=0
+if test "$debug" -eq 1 ; then
+  out="tee"
+else
+  out="output"
+fi
 cwd=`pwd`
 bin/bacula stop  2>&1 >/dev/null
 cd bin
@@ -31,24 +42,32 @@ echo " === Starting incremental-2tape test ==="
 echo " === Starting incremental-2tape test ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+# Write out bconsole commands
+cat <<END_OF_DATA >tmp/bconcmds
+@$out /dev/null
 messages
-@output tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1
-label storage=DDS-4 volume=TestVolume002 slot=2
+@$out tmp/log1.out
+label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0
 run job=NightlySave yes
 wait
 messages
 quit
 END_OF_DATA
+
+if test "$debug" -eq 1 ; then
+  bin/bacula start
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
+fi
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@output /dev/null
+@$out /dev/null
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 run level=Incremental job=NightlySave yes
@@ -57,7 +76,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores 
 7
 <${cwd}/tmp/restore-list
@@ -65,13 +84,13 @@ restore where=${cwd}/tmp/bacula-restores
 yes
 wait
 messages
-@output
+@$out
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
+grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 #
 # Delete .c files because we will only restored the txt files