Update

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

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index a9287dce5eed600b206ceb6780060dc00f2ce263..80ac6ee7ee5a523c839a3f6f750b3549ef80d143 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -8,9 +8,8 @@ JobName=Incremental
 . scripts/functions
 set_debug 0
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
+scripts/copy-test-confs
 echo "${cwd}/tmp/build" >/tmp/file-list
 mkdir ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
@@ -19,6 +18,7 @@ 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
@@ -27,7 +27,7 @@ messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
 label storage=File volume=TestVolume002
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -48,7 +48,7 @@ messages
 @$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
@@ -64,7 +64,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -82,7 +82,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-run level=Differential job=CompressedTest yes
+run level=Differential job=$JobName yes
 wait
 messages
 quit
@@ -97,7 +97,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -112,7 +112,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -127,7 +127,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+run level=Incremental job=$JobName yes
 wait
 messages
 quit
@@ -142,7 +142,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-run level=Incremental job=CompressedTest yes
+run level=Incremental job=$JobName yes
 wait
 messages
 @#