X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-test;h=91753ce95ffa87e1406fc66155d9454ac97807b8;hb=7d5eacc922052324417c82382d6a18e8054245e8;hp=f41a84fe3ead6228d251d1932808ad63d9582f6d;hpb=a30aac156afdf99aad0965ac65297501728d498a;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index f41a84fe3e..91753ce95f 100755
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -7,24 +7,26 @@ TestName="incremental-test"
 JobName=Incremental 
 . scripts/functions
 
-scripts/cleanup
-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
-echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
-echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
+${rscripts}/cleanup
+${rscripts}/copy-test-confs
+echo "${tmpsrc}" >${tmp}/file-list
+mkdir -p ${tmpsrc}
+cp -p ${src}/src/dird/*.c ${tmpsrc}
+cd ${tmp}
+echo "${tmpsrc}/ficheriro1.txt" >restore-list
+echo "${tmpsrc}/ficheriro2.txt" >>restore-list
 cd ${cwd}
 
 change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 @#setdebug level=100 storage=File
+@#setdebug level=200 client
+@#setdebug level=100 director
 label storage=File volume=TestVolume001
 label storage=File volume=TestVolume002
 run job=$JobName yes
@@ -39,13 +41,13 @@ check_for_zombie_jobs storage=File
 # Now create two new files to be restored later
 #
 sleep 1
-echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
-cp -f ${cwd}/tmp/build/dird.c ${cwd}/tmp/build/ficheriro2.txt
+echo "ficheriro1.txt" >${tmpsrc}/ficheriro1.txt
+cp -f ${tmpsrc}/dird.c ${tmpsrc}/ficheriro2.txt
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 run level=Differential job=$JobName yes
@@ -57,13 +59,13 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 run level=Incremental job=$JobName yes
 wait
 messages
@@ -73,15 +75,15 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-cd ${cwd}/tmp/build
+cd ${tmpsrc}
 cp -f ficheriro2.txt 1
 sed "s%a%b%g" 1 >ficheriro2.txt
 rm -f 1
 cd ${cwd}
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 run level=Differential job=$JobName yes
 wait
 messages
@@ -91,12 +93,12 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 run level=Incremental job=$JobName yes
 wait
 messages
@@ -106,12 +108,12 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 run level=Incremental job=$JobName yes
 wait
 messages
@@ -121,12 +123,12 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 run level=Incremental job=$JobName yes
 wait
 messages
@@ -135,13 +137,13 @@ END_OF_DATA
 
 run_bconsole
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
 
-cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
-@$out ${cwd}/tmp/log1.out
+@$out ${tmp}/log1.out
 setdebug level=200 storage=File
 run level=Incremental job=$JobName yes
 wait
@@ -149,9 +151,9 @@ messages
 @# 
 @# now do a restore
 @#
-@$out ${cwd}/tmp/log2.out
+@$out ${tmp}/log2.out
 setdebug level=10 storage=File
-restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list
+restore where=${tmp}/bacula-restores storage=File file=<${tmp}/restore-list
 yes
 wait
 status storage=File
@@ -168,6 +170,6 @@ check_two_logs
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f ${cwd}/tmp/build/*.c
+rm -f ${tmpsrc}/*.c
 check_restore_tmp_build_diff
 end_test