X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-2disk;h=1c1efb4c0005c7f9d9b9ede5f6af95243333d911;hb=55b2a841b303bc2ac121e14ce0e6659cb1d46cb0;hp=68eb9f452dfaae94d87f1c4f65f4f137366c8c3f;hpb=a893b78725a277379f3d6bce4c9dde90a0ee8415;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 68eb9f452d..1c1efb4c00 100755
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -5,12 +5,10 @@
 #
 # This script uses the virtual disk autochanger
 #
-TestName="incremental-2disk-test"
+TestName="incremental-2disk"
 JobName=Inc2disk
 . scripts/functions
-set_debug 0
 
-. config.out
 
 stop_bacula
 cd bin
@@ -20,9 +18,9 @@ cd bin
 cd ..
 
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
 
-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
@@ -36,10 +34,10 @@ change_jobname $JobName
 start_test
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$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=$JobName yes
@@ -54,10 +52,10 @@ echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 run level=Incremental job=$JobName yes
@@ -66,7 +64,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores 
 7
 <${cwd}/tmp/restore-list
@@ -85,8 +83,22 @@ stop_bacula
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 
 check_two_logs
 check_restore_tmp_build_diff
+
+#
+# This script seems to more or less randomly fail, so we
+#  add extra code here to produce a "dump" in the event of
+#  an error.
+#
+if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
+   cat ${cwd}/tmp/log1.out
+   echo "  "
+   cat ${cwd}/tmp/log2.out
+   echo "  "
+   diff -r ${cwd}/tmp/build ${cwd}/tmp/bacula-restores${cwd}/tmp/build
+fi
+
 end_test