Update

[bacula/bacula] / regress / tests / incremental-2tape

diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 6ed796897f4042479032c74fa96fdb0eee44939f..67d4211a20298bcfd2b6083d9f803ee70c2f41ba 100755 (executable)
--- a/regress/tests/incremental-2tape
+++ b/regress/tests/incremental-2tape
@@ -5,6 +5,17 @@
 #
 # This script uses the autochanger and two tapes
 #
+. scripts/functions
+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
@@ -15,7 +26,7 @@ cd ..
 
 scripts/copy-2tape-confs
 scripts/cleanup-2tape
-echo "${cwd}/tmp/build" >/tmp/file-list
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then
    mkdir ${cwd}/tmp/build
 fi
@@ -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 >${cwd}/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 ${cwd}/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 ${cwd}/tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
+else
+  bin/bacula start 2>&1 >/dev/null
+  cat ${cwd}/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 ${cwd}/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 ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores 
 7
 <${cwd}/tmp/restore-list
@@ -65,19 +84,19 @@ 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" ${cwd}/tmp/log1.out 2>&1 >/dev/null
 bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
+grep "^  Termination: *Restore OK" ${cwd}/tmp/log2.out 2>&1 >/dev/null
 rstat=$?
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
-diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null
+rm -f ${cwd}/tmp/build/*.c
+diff -r ${cwd}/tmp/build ${cwd}/tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null
 if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "