Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula

[bacula/bacula] / regress / tests / incremental-test

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 0d8afba264520d298fd1e8755ebf318da6c3bc60..91753ce95ffa87e1406fc66155d9454ac97807b8 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -9,12 +9,12 @@ JobName=Incremental
 
 ${rscripts}/cleanup
 ${rscripts}/copy-test-confs
-echo "${tmp}/build" >${tmp}/file-list
-mkdir ${tmp}/build
-cp -p ${cwd}/build/src/dird/*.c ${tmp}/build
-cd ${cwd}/tmp
-echo "${tmp}/build/ficheriro1.txt" >restore-list
-echo "${tmp}/build/ficheriro2.txt" >>restore-list
+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
@@ -25,6 +25,8 @@ cat <<END_OF_DATA >${tmp}/bconcmds
 messages
 @$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,8 +41,8 @@ check_for_zombie_jobs storage=File
 # Now create two new files to be restored later
 #
 sleep 1
-echo "ficheriro1.txt" >${tmp}/build/ficheriro1.txt
-cp -f ${tmp}/build/dird.c ${tmp}/build/ficheriro2.txt
+echo "ficheriro1.txt" >${tmpsrc}/ficheriro1.txt
+cp -f ${tmpsrc}/dird.c ${tmpsrc}/ficheriro2.txt
 
 cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
@@ -57,8 +59,8 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${tmp}/build/ficheriro1.txt
-touch ${tmp}/build/ficheriro2.txt
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
 
 cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
@@ -73,7 +75,7 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-cd ${tmp}/build
+cd ${tmpsrc}
 cp -f ficheriro2.txt 1
 sed "s%a%b%g" 1 >ficheriro2.txt
 rm -f 1
@@ -91,8 +93,8 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${tmp}/build/ficheriro1.txt
-touch ${tmp}/build/ficheriro2.txt
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
 cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
@@ -106,8 +108,8 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${tmp}/build/ficheriro1.txt
-touch ${tmp}/build/ficheriro2.txt
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
 cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
@@ -121,8 +123,8 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${tmp}/build/ficheriro1.txt
-touch ${tmp}/build/ficheriro2.txt
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
 cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
 messages
@@ -135,8 +137,8 @@ END_OF_DATA
 
 run_bconsole
 sleep 1
-touch ${tmp}/build/ficheriro1.txt
-touch ${tmp}/build/ficheriro2.txt
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
 
 cat <<END_OF_DATA >${tmp}/bconcmds
 @output /dev/null
@@ -168,6 +170,6 @@ check_two_logs
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f ${tmp}/build/*.c
+rm -f ${tmpsrc}/*.c
 check_restore_tmp_build_diff
 end_test