From 7536ad5ca65a3bde880d0890b942be653a6ad631 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 30 Jun 2006 18:59:29 +0000 Subject: [PATCH] Update disk tests git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3100 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/bacula-sd-tape.conf.in | 2 +- regress/scripts/functions | 33 +++++++++++++++- regress/tests/auto-label-test | 11 +++--- regress/tests/backup-bacula-tape | 6 +-- regress/tests/backup-bacula-test | 3 +- regress/tests/bextract-test | 2 +- regress/tests/bscan-tape | 52 ++++++++----------------- regress/tests/bscan-test | 2 +- regress/tests/bsr-opt-test | 3 +- regress/tests/btape-fill-tape | 6 +-- regress/tests/compressed-test | 4 +- regress/tests/concurrent-jobs-test | 16 ++++---- regress/tests/differential-test | 7 ++-- regress/tests/filed-crypto-test | 4 +- regress/tests/fixed-block-size-tape | 10 ++--- regress/tests/four-concurrent-jobs-test | 3 +- regress/tests/four-jobs-test | 15 +++---- regress/tests/incremental-test | 18 ++++----- regress/tests/query-test | 8 ++-- regress/tests/recycle-test | 2 +- regress/tests/restore-by-file-test | 5 ++- regress/tests/restore-disk-seek-test | 4 +- regress/tests/restore2-by-file-test | 3 +- regress/tests/scratch-pool-test | 2 +- regress/tests/six-vol-test | 5 ++- regress/tests/span-vol-test | 2 +- regress/tests/two-jobs-test | 12 +++--- regress/tests/two-vol-test | 2 +- regress/tests/two-volume-test | 4 +- regress/tests/verify-vol-test | 2 +- regress/tests/weird-files-test | 2 +- regress/tests/weird-files2-test | 2 +- 32 files changed, 134 insertions(+), 118 deletions(-) diff --git a/regress/scripts/bacula-sd-tape.conf.in b/regress/scripts/bacula-sd-tape.conf.in index 62023f24df..ea3c0ae8d4 100644 --- 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 8c924a7ba7..21613ad5de 100644 --- 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 aa0ed25dd5..6583937e03 100755 --- 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 <tmp/bconcmds +cat <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 ae7e17d59e..1494bcac9c 100755 --- 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 <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 aa20cab740..bf329d125a 100755 --- 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 <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 b000039f1c..f87c7cdf1c 100755 --- 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 <tmp/bconcmds diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index f230d49a7d..7f7e708c1e 100755 --- 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 <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 <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 <&1 >/dev/null + +cat <tmp/bconcmds @$out /dev/null messages @$out tmp/log2.out diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index 44bfe9c1b2..b7db28593d 100755 --- 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 <tmp/bconcmds diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index e4ca9a3157..cec9cd611f 100755 --- 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 <tmp/bconcmds diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape index e658e966e9..e84e465100 100755 --- 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 <&1 >tmp/log1.out +cat <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 8f10d91599..ba0a8debca 100755 --- 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 <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 5231c09674..1cb0580ce9 100755 --- 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 <tmp/bconcmds @@ -35,10 +36,10 @@ cat <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 80c9d69248..652a66a6c1 100755 --- 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 <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 <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 ec78307f75..6d39fc8831 100755 --- 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 <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 4d07bccdf1..e57d6ba1c1 100755 --- 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 <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 95e88a16b2..b756ded489 100755 --- 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 <tmp/bconcmds diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index 05da4ccb4d..ca56c665ce 100755 --- 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 <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 <tmp/bconcmds @output /dev/null messages @$out tmp/log1.out -run job=CompressedTest +run job=$JobName yes wait messages @@ -65,7 +66,7 @@ cat <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 <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 a9287dce5e..4aaf080e21 100755 --- 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 <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 <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 <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 <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 <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 <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 <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 3e27498622..5f2f057ed7 100755 --- 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 <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 <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 a34126beac..19a5514f30 100755 --- 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 <tmp/bconcmds diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index 8801eb9a63..3cb53805d0 100755 --- 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 <tmp/bconcmds @@ -29,7 +30,7 @@ cat <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 31ec4ebeae..0e5a17fa15 100755 --- 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 <tmp/bconcmds @@ -42,7 +42,7 @@ cat <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 5239eb009b..b374c4020d 100755 --- 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 <tmp/bconcmds @@ -21,7 +22,7 @@ cat <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 2f3d6ec0ed..f8fb24f88b 100755 --- 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 10fb23ea96..d79ab914f7 100755 --- 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 <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 21f0026b7c..222851bc63 100755 --- 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 <tmp/bconcmds diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index 2010d81ed9..ac38223ece 100755 --- 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 <tmp/bconcmds </tmp/file-list -change_jobname $JobName +change_jobname NightlySave $JobName start_test cat <tmp/bconcmds diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test index 4a2eac748d..68b4feb3f5 100755 --- 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 <tmp/bconcmds @$out /dev/null diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index 23047f2d07..fd6bb70a06 100755 --- 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 <tmp/bconcmds diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 4174ec4371..bac826fb66 100755 --- 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 02b18f6bca..9971fd4423 100755 --- 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 -- 2.39.5