X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-test;h=a5149051f6435fd5eab553ab8e16b50a6476f1fe;hb=43170b6b4bc3f650fd69f40e234aee304226ef86;hp=a9287dce5eed600b206ceb6780060dc00f2ce263;hpb=7f350ed9bd70b3cbfdb0d48d091710eb1a6101ac;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index a9287dce5e..a5149051f6 100755
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -6,12 +6,10 @@
 TestName="incremental-test"
 JobName=Incremental 
 . scripts/functions
-set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/tmp/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 mkdir ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp
@@ -19,15 +17,17 @@ echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
 echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
 cd ${cwd}
 
+change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
+@#setdebug level=100 storage=File
 label storage=File volume=TestVolume001
 label storage=File volume=TestVolume002
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -42,13 +42,13 @@ sleep 1
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 cp -f ${cwd}/tmp/build/dird.c ${cwd}/tmp/build/ficheriro2.txt
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /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=Differential job=CompressedTest yes
+run level=Differential job=$JobName yes
 wait
 messages
 quit
@@ -60,11 +60,11 @@ sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${cwd}/tmp/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -78,11 +78,11 @@ cp -f ficheriro2.txt 1
 sed "s%a%b%g" 1 >ficheriro2.txt
 rm -f 1
 cd ${cwd}
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-run level=Differential job=CompressedTest yes
+@$out ${cwd}/tmp/log1.out
+run level=Differential job=$JobName yes
 wait
 messages
 quit
@@ -93,11 +93,11 @@ run_bconsole
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${cwd}/tmp/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -108,11 +108,11 @@ run_bconsole
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${cwd}/tmp/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -123,11 +123,11 @@ run_bconsole
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${cwd}/tmp/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -138,17 +138,17 @@ sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${cwd}/tmp/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@output ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list
 yes
 wait
@@ -165,6 +165,6 @@ check_two_logs
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 check_restore_tmp_build_diff
 end_test