Update disk tests

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3100 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/bacula-sd-tape.conf.in b/regress/scripts/bacula-sd-tape.conf.in
index 62023f24dfb15d0a5d959a0c2950cd33c667cd81..ea3c0ae8d42f2cbe44f96ccfff7bbfa5abc1ff03 100644 (file)
--- a/regress/scripts/bacula-sd-tape.conf.in
+++ b/regress/scripts/bacula-sd-tape.conf.in
@@ -41,7 +41,7 @@ Device {
   RemovableMedia = yes;
   @@sbindir@/tape_options
 # Maximum File Size = 1000000
-# MaximumVolumeSize = 100M
+# MaximumVolumeSize = 400M
 }
 
 # 

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 8c924a7ba73af947afefd60840abce8fef797394..21613ad5de3f673b0805766c2f6f6164df37a988 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -41,6 +41,16 @@ run_bconsole()
    fi
 }
 
+run_btape()
+{
+   if test "$debug" -eq 1 ; then
+     cat tmp/bconcmds | bin/btape -c bin/bacula-sd.conf DDS-4 | tee tmp/log1.out
+   else
+     cat tmp/bconcmds | bin/btape -c bin/bacula-sd.conf DDS-4 2>&1 >tmp/log1.out
+   fi
+}
+
+
 stop_bacula()
 {
    bin/bacula stop 2>&1 >/dev/null
@@ -53,10 +63,18 @@ check_for_zombie_jobs()
 
 change_jobname()
 {
+   if test $# == 1; then
+      oldname=NightlySave
+      newname=$1
+   else
+      oldname=$1
+      newname=$2
+   fi
    rm -f bin/1
    mv bin/bacula-dir.conf bin/1
-   echo "s%NightlySave%$1%g" >/tmp/1
+   echo "s%${oldname}%${newname}%g" >/tmp/1
    sed -f /tmp/1 bin/1 >bin/bacula-dir.conf
+   echo "Job ${oldname} changed to ${newname}"
 }
 
 check_two_logs()
@@ -101,5 +119,18 @@ end_test()
    fi
 }
 
+copy_tape_confs()
+{
+   scripts/copy-tape-confs
+   scripts/cleanup-tape
+}
+
+copy_test_confs()
+{
+   scripts/copy-test-confs
+   scripts/cleanup
+}
+
+
 # Save current directory
 cwd=`pwd`

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index aa0ed25dd5c84c45793c8df4d00f5236daf0906a..6583937e0364134bb1ec1325088f8139170bbfd4 100755 (executable)
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -7,18 +7,17 @@ TestName="auto-label-test"
 JobName=AutoLabel
 . scripts/functions
 set_debug 0
+copy_test_confs
 
-cwd=`pwd`
-scripts/copy-test-confs
-scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 sed "s%# Label Format%  Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
+change_jobname CompressedTest $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_SCRIPT >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
@@ -27,7 +26,7 @@ status all
 list pools
 messages
 @#setdebug level=110 storage=File
-run job=CompressedTest storage=File yes
+run job=$JobName storage=File yes
 list pools
 list volumes
 wait
@@ -54,7 +53,7 @@ wait
 messages
 @$out
 quit
-END_OF_DATA
+END_OF_SCRIPT
 
 run_bacula
 check_for_zombie_jobs storage=File

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index ae7e17d59e9f8072114788017a299ba241c6f80e..1494bcac9c195718249a7b9ade598cb2021142ea 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -16,7 +16,7 @@ scripts/cleanup-tape
 
 echo "${cwd}/build" >/tmp/file-list
 
-change_job $JobName
+change_jobname NightlySave $JobName
 start_test
 
 
@@ -30,7 +30,7 @@ purge volume=TestVolume001
 relabel pool=Default storage=DDS-4 oldVolume=TestVolume001 volume=TestVolume002 slot=0
 purge volume=TestVolume002
 relabel pool=Default storage=DDS-4 oldVolume=TestVolume002 volume=TestVolume001 slot=0
-run job=NightlySave yes
+run job=$JobName yes
 status storage=DDS-4
 status storage=DDS-4
 status storage=DDS-4
@@ -89,7 +89,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 list volumes
-run job=NightlySave yes
+run job=$JobName yes
 wait
 list volumes
 messages

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index aa20cab740cbc4ad20d5ac28cc158e03b5db67af..bf329d125a263c48007e4a5ce5e05980a8b72eb3 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -11,6 +11,7 @@ set_debug 0
 scripts/copy-confs
 scripts/cleanup
 
+change_jobname Client1 $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -19,7 +20,7 @@ messages
 @$out tmp/log1.out
 label volume=TestVolume001
 @#setdebug level=100 storage=File
-run job=Client1 yes
+run job=$JobName yes
 status storage=File
 status storage=File
 status storage=File

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index b000039f1cb7ac1be41af9153ac3ce6b398a6be4..f87c7cdf1c326e4638aa48f998fb915ca5c5789e 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -13,7 +13,7 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
-change_jobname $JobName 
+change_jobname NightlySave $JobName 
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index f230d49a7d53370d5db9c06755dce533e4f495b4..7f7e708c1e6d45bf64a9862fbba91f936a8d1fd6 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -10,14 +10,14 @@ JobName=bscantape
 . scripts/functions
 set_debug 0
 
-scripts/copy-tape-confs
-scripts/cleanup-tape
+copy_tape_confs
+
 echo "${cwd}/build" >/tmp/file-list
 
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -39,14 +39,9 @@ messages
 quit
 END_OF_DATA
 
-if test "$debug" -eq 1 ; then
-  bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
-else
-  bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
-fi
-scripts/check_for_zombie_jobs storage=DDS-4
+run_bacula
+check_for_zombie_jobs storage=DDS-4
+
 echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
@@ -64,15 +59,10 @@ wait
 messages
 quit
 END_OF_DATA
-if test "$debug" -eq 1 ; then
-  bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
-else
-  bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
-fi
 
+run_bacula
 scripts/check_for_zombie_jobs storage=DDS-4
+
 echo "Backup 2 done"
 touch ${cwd}/build/src/dird/*.c
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -88,15 +78,10 @@ wait
 messages
 quit
 END_OF_DATA
-if test "$debug" -eq 1 ; then
-  bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
-else
-  bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
-fi
 
+run_bacula
 scripts/check_for_zombie_jobs storage=DDS-4
+
 echo "Backup 3 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -104,7 +89,6 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
@@ -114,15 +98,12 @@ wait
 messages
 quit
 END_OF_DATA
-if test "$debug" -eq 1 ; then
-  bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
-else
-  bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
-fi
+
+run_bacula
 
 scripts/check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
 echo "Backup 4 done"
 #
 # now drop and recreate the database
@@ -133,11 +114,10 @@ cd bin
 ./grant_bacula_privileges 2>&1 >/dev/null
 cd ..
 
-bin/bacula stop 2>&1 >/dev/null
 echo "volume=TestVolume001" >tmp/bscan.bsr
 bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+
+cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log2.out

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 44bfe9c1b29b34d61288302335480c2d575d09f5..b7db28593db4eee80068cbade4e4d484a2023ee3 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -16,7 +16,7 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index e4ca9a31575df86d3c6cd7326667feda805c45b9..cec9cd611fe552111e8cad3a6d4724d719b447f5 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -15,8 +15,7 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
-change_jobname $JobName
-
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape
index e658e966e91d4927a24a9fc3583921c5925048ca..e84e465100e9187ea4c521a87b1e8e08317131df 100755 (executable)
--- a/regress/tests/btape-fill-tape
+++ b/regress/tests/btape-fill-tape
@@ -7,8 +7,7 @@ JobName=filltape
 . scripts/functions
 set_debug 0
 
-scripts/copy-tape-confs
-scripts/cleanup-tape
+copy_tape_confs
 
 echo "${cwd}/build" >/tmp/file-list
 
@@ -17,13 +16,14 @@ sed "s%# MaximumVolumeSize%  MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula
 
 start_test
 
-bin/btape -c bin/bacula-sd.conf DDS-4 <<END_OF_DATA 2>&1 >tmp/log1.out
+cat <<END_OF_DATA >tmp/bconcmds
 fill
 s
 
 quit
 END_OF_DATA
 
+run_btape DDS-4
 
 grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null
 if [ $? != 0 ] ; then

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 8f10d91599cc3e7268cfb38a7ef8bfed8e15ddce..ba0a8debcaf3731cc92b6551dc5504080b4eab71 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -12,6 +12,7 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
+change_jobname CompressedTest $JobName
 start_test
       
 cat <<END_OF_DATA >tmp/bconcmds
@@ -22,7 +23,7 @@ status all
 status all
 messages
 label storage=File volume=TestVolume001
-run job=CompressedTest storage=File yes
+run job=$JobName storage=File yes
 wait
 messages
 @# 
@@ -47,4 +48,3 @@ stop_bacula
 check_two_logs
 check_restore_diff
 end_test
-

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 5231c09674db6f62fd2a0b3db2145cd2a2792777..1cb0580ce9df08f174ef025b0b140ff62e988b81 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -8,8 +8,8 @@ JobName=concurrent-jobs
 . scripts/functions
 set_debug 0
 
-scripts/copy-test-confs
-scripts/cleanup
+copy_test_confs
+
 echo "${cwd}/tmp/largefile" >/tmp/file-list
 if test -c /dev/urandom ; then
 # Create 56MB file with random data
@@ -28,6 +28,7 @@ fi
 
 echo "largefile created"
 
+change_jobname CompressedTest $JobName
 start_test
      
 cat <<END_OF_DATA >tmp/bconcmds
@@ -35,10 +36,10 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out  tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest level=Full yes
-run job=CompressedTest level=Full yes
-run job=CompressedTest level=Full yes
-run job=CompressedTest level=Full yes
+run job=$JobName level=Full yes
+run job=$JobName level=Full yes
+run job=$JobName level=Full yes
+run job=$JobName level=Full yes
 wait
 messages
 @# 
@@ -61,5 +62,6 @@ check_for_zombie_jobs storage=File
 stop_bacula
 
 check_two_logs
-check_restore_diff
+diff tmp/largefile  tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null
+dstat=$?
 end_test

diff --git a/regress/tests/differential-test b/regress/tests/differential-test
index 80c9d692485ff8a4028a1bd6b57df5d682740232..652a66a6c1381cdc8cfbfd734525367980cfd1dc 100755 (executable)
--- a/regress/tests/differential-test
+++ b/regress/tests/differential-test
@@ -18,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
@@ -26,7 +27,7 @@ messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume002
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -44,7 +45,7 @@ messages
 @$out tmp/log1.out
 @# Force differential on the second Volume
 update volume=TestVolume002 VolStatus=Used
-run level=differential job=CompressedTest yes
+run level=differential job=$JobName yes
 wait
 messages
 @$out
@@ -59,7 +60,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-run level=incremental job=CompressedTest yes
+run level=incremental job=$JobName yes
 wait
 messages
 @# 

diff --git a/regress/tests/filed-crypto-test b/regress/tests/filed-crypto-test
index ec78307f752bfc1574aa0196e5e263a3bc17df05..6d39fc883114b8085a2bab4b009d86be22929974 100755 (executable)
--- a/regress/tests/filed-crypto-test
+++ b/regress/tests/filed-crypto-test
@@ -12,7 +12,7 @@ scripts/copy-crypto-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -21,7 +21,7 @@ messages
 @$out tmp/log1.out
 setdebug level=1 storage=File sd
 label storage=File volume=TestVolume001
-run job=NightlySave yes
+run job=$JobName yes
 wait
 messages
 @# 

diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape
index 4d07bccdf13f0586d232a834c0907b0dc4986dcb..e57d6ba1c1e0ec18617d2975efdf6f2ad57064a3 100755 (executable)
--- a/regress/tests/fixed-block-size-tape
+++ b/regress/tests/fixed-block-size-tape
@@ -7,10 +7,10 @@
 TestName="fixed-block-size-tape"
 JobName=fixedblocksize
 . scripts/functions
-set_debug 0
+set_debug 1
+
+copy_tape_confs
 
-scripts/copy-tape-confs
-scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list
 
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
@@ -26,7 +26,7 @@ if [ $? != 0 ] ; then
 fi
 rm -f ${cwd}/tmp/1 ${cwd}/tmp/2
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
 
@@ -35,7 +35,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
-run job=NightlySave yes
+run job=$JobName yes
 wait
 messages
 @# 

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 95e88a16b2daa735342627ff49c614c40617fd0c..b756ded489a318db0a734ae1095d62a997dfd811 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -11,8 +11,7 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
-change_jobname $JobName
-
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index 05da4ccb4d3a14777efc622c04ac68b3d3bded30..ca56c665ce052014ce270e3b5dac32c3ea785175 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -14,17 +14,18 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 
+change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
+estimate job=$JobName listing
+estimate job=$JobName listing
+estimate job=$JobName listing
 messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -44,7 +45,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out  tmp/log1.out
-run job=CompressedTest
+run job=$JobName
 yes
 wait
 messages
@@ -65,7 +66,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @output tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -85,7 +86,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @output tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index a9287dce5eed600b206ceb6780060dc00f2ce263..4aaf080e21871237870304b92aa7a3aec163d1fe 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -8,7 +8,6 @@ JobName=Incremental
 . scripts/functions
 set_debug 0
 
-cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/tmp/build" >/tmp/file-list
@@ -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
 @# 

diff --git a/regress/tests/query-test b/regress/tests/query-test
index 3e274986222e5ac5b003acb38d53d92e5ab46db1..5f2f057ed7d167bad549db932a5e3b2505048ef3 100755 (executable)
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -9,7 +9,6 @@ JobName=query
 . scripts/functions
 set_debug 0
 
-cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/tmp/build" >/tmp/file-list
@@ -20,6 +19,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
@@ -28,7 +28,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
@@ -46,7 +46,7 @@ messages
 @$out tmp/log1.out
 @# Force differental on the second Volume
 update volume=TestVolume001 VolStatus=Used
-run level=differental job=CompressedTest yes
+run level=differental job=$JobName yes
 wait
 messages
 @output
@@ -60,7 +60,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
 @#

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index a34126beac34876bdaae688e2b5c93731d260b8c..19a5514f30df8f1416f4c80de6cd630a0d57b051 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -14,8 +14,8 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
 
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 8801eb9a63be19bcea22f6b1009a965adcf24043..3cb53805d0ef3cff0f2e26c9d42edde98f4f384c 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -5,7 +5,7 @@
 #
 
 TestName="restore-by-file-test"
-JobName=SpanVol
+JobName=restorebyfile
 . scripts/functions
 set_debug 0
 
@@ -22,6 +22,7 @@ sed s%\^%${cwd}/tmp/build/% 1 >restore-list
 rm -f 1
 cd ${cwd}
 
+change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -29,7 +30,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 @# 

diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 31ec4ebeaed3092817ff3a9b79e695aa6623a593..0e5a17fa15ab0017a169e38bb5502d6739735a5a 100755 (executable)
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -11,7 +11,6 @@ JobName=restore-disk-seek
 . scripts/functions
 set_debug 0
 
-cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/tmp/build" >/tmp/file-list
@@ -35,6 +34,7 @@ cp -fp ${cwd}/build/src/dird/* ${cwd}/tmp/build
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
+change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -42,7 +42,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 @# 

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 5239eb009b1cf8b4aa3e7a29915bca10c0ffa3cb..b374c4020d3fda9589646eb68dbe57a30834173a 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -14,6 +14,7 @@ scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
 
+change_jobname CompressedTest $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -21,7 +22,7 @@ cat <<END_OF_DATA >tmp/bconcmds
 messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 @# 

diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test
index 2f3d6ec0edbc49ef9e502a9cf90fd9d4c9b008e8..f8fb24f88b23d62a4e7e7cf2af5d09e001abe98b 100755 (executable)
--- a/regress/tests/scratch-pool-test
+++ b/regress/tests/scratch-pool-test
@@ -32,8 +32,8 @@ outf="tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
-change_jobname $JobName
 
+change_jobname NightlySave $JobName
 start_test
 
 # Write out bconsole commands

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 10fb23ea969b1d06336d1a375d1a74c6d75c2cc6..d79ab914f74ddbb61f20051ac0738ac935e5a665 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -12,7 +12,7 @@ if test ! -c /dev/urandom ; then
    echo "No random device. Test skipped.\n"
    exit 0
 fi
-cwd=`pwd`
+
 scripts/copy-testa-confs
 scripts/cleanup
 echo "${cwd}/tmp/largefile" >/tmp/file-list
@@ -21,13 +21,14 @@ echo "Creating a 56MB file with random data ..."
 dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
 echo "largefile created"
 
+change_jobname MultiVol $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
 @$out tmp/log1.out
-run job=MultiVol storage=File yes
+run job=$JobName storage=File yes
 wait
 messages
 @# 

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 21f0026b7cf9985b6179dac9de3726dd316c5f35..222851bc6363e6664ee2279317f3b9625fdb1eed 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -14,8 +14,8 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
 
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 2010d81ed92e65f70fc8430d5cc63af53739f5fd..ac38223ecea6764ac53b82336f584a2f776e2498 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -12,8 +12,8 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
 
+change_jobname CompressedTest $JobName
 start_test
 
 cat >tmp/bconcmds <<END_OF_DATA
@@ -21,13 +21,13 @@ setdebug level=15  storage=File
 @output /dev/null
 messages
 @output/dev/null
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
+estimate job=$JobName listing
+estimate job=$JobName listing
+estimate job=$JobName listing
 messages
 @$out tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
@@ -45,7 +45,7 @@ cat >tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
 @$out tmp/log1.out
-run job=CompressedTest
+run job=$JobName
 yes
 wait
 messages

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 2c6e0930f601b97cc50064857d6f9d90afe12164..55adfb12195560d1ede7565b1dfc3d20dc488bab 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -12,8 +12,8 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
 
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index 4a2eac748d798475970e234e168fbe36584d51a3..68b4feb3f5d5d8b237695953c77a3dc826cba9d1 100755 (executable)
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -28,9 +28,9 @@ echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
-change_jobname $JobName
-
+change_jobname NightlySave $JobName
 start_test
+
 # Write out bconsole commands
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 23047f2d07f02353baa0d6337f1ba5c3c4e0d78e..fd6bb70a0670a238ce3db64c06c4bdd191f24e7a 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -12,8 +12,8 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
-change_jobname $JobName
 
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 4174ec43718d173b1d09772d2c8ae0e220376175..bac826fb662b795e44472b7176bf7bd5aea261a4 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -17,7 +17,7 @@ fi
 cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
-change_jobname $JobName
+change_jobname NightlySave $JobName
 #
 # Note, we save the weird-files directory twice on purpose
 #  because this causes problems with hard linked files 

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 02b18f6bcad63d41272f47ab6aa3d09d3da12198..9971fd44231b29c8d5981ca3fec2b195b357bc99 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -19,8 +19,8 @@ scripts/cleanup
 rm -rf weird-files2
 cp -Rp weird-files weird-files2
 echo "${cwd}/weird-files2" >/tmp/file-list
-change_jobname $JobName
 
+change_jobname NightlySave $JobName
 start_test
 
 bin/testls weird-files2 >${cwd}/tmp/original