X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-2disk;h=48b36ce7217ac2b147b82dea22683b09f81b5cea;hb=b3d16d6c193ef2f61f7cc3fbefc72a8c8b1b79d8;hp=7f99654e192c7c7b76e076e48a4757eacccd50a8;hpb=1269a9bdaea291be49a9abe8a2591641cf1aa0d4;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 7f99654e19..48b36ce721 100755
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -8,21 +8,12 @@
 TestName="incremental-2disk"
 JobName=Inc2disk
 . scripts/functions
-set_debug 0
-
-. config.out
-
-stop_bacula
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
 
+scripts/cleanup
 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 +27,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 +45,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 +57,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,7 +76,7 @@ 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
@@ -96,11 +87,11 @@ check_restore_tmp_build_diff
 #  an error.
 #
 if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
-   cat tmp/log1.out
+   cat ${cwd}/tmp/log1.out
    echo "  "
-   cat tmp/log2.out
+   cat ${cwd}/tmp/log2.out
    echo "  "
-   diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build
+   diff -r ${cwd}/tmp/build ${cwd}/tmp/bacula-restores${cwd}/tmp/build
 fi
 
 end_test