X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fincremental-test;h=b7dca5200050f745cad4e73eca595b3f446dd0c0;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=a9287dce5eed600b206ceb6780060dc00f2ce263;hpb=0830bb18ada29945abbd1aebaad51c424d7d4593;p=bacula%2Fbacula

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index a9287dce5e..b7dca52000 100755
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -6,28 +6,30 @@
 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
-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 >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out 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=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -39,16 +41,16 @@ 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 >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${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
@@ -57,14 +59,14 @@ 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 >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${tmp}/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -73,16 +75,16 @@ 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 >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-run level=Differential job=CompressedTest yes
+@$out ${tmp}/log1.out
+run level=Differential job=$JobName yes
 wait
 messages
 quit
@@ -91,13 +93,13 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${tmp}/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -106,13 +108,13 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${tmp}/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -121,13 +123,13 @@ END_OF_DATA
 run_bconsole
 
 sleep 1
-touch ${cwd}/tmp/build/ficheriro1.txt
-touch ${cwd}/tmp/build/ficheriro2.txt
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+touch ${tmpsrc}/ficheriro1.txt
+touch ${tmpsrc}/ficheriro2.txt
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${tmp}/log1.out
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -135,25 +137,27 @@ 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 >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${tmp}/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+@$out ${tmp}/log1.out
+setdebug level=200 storage=File
+run level=Incremental job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list
+@$out ${tmp}/log2.out
+setdebug level=10 storage=File
+restore where=${tmp}/bacula-restores storage=File file=<${tmp}/restore-list
 yes
 wait
+status storage=File
 messages
-@output
 quit
 END_OF_DATA
 
@@ -165,6 +169,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