From: Kern Sibbald Date: Sat, 12 Jun 2004 11:36:03 +0000 (+0000) Subject: Update and add tests X-Git-Tag: Release-1.34.4~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4169fb325368e46922286d884ddd529ec45c21e9;p=bacula%2Fbacula Update and add tests git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1410 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests index 3cd0fb92fe..c36f440458 100755 --- a/regress/all-non-root-tests +++ b/regress/all-non-root-tests @@ -27,6 +27,7 @@ tests/incremental-test tests/decremental-test tests/restore-disk-seek-test tests/query-test +tests/auto-label-test echo " " echo " " echo "Test results" diff --git a/regress/file b/regress/file new file mode 100755 index 0000000000..8f2089051b --- /dev/null +++ b/regress/file @@ -0,0 +1,2 @@ +#!/bin/sh +./all-non-root-tests diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup index 2cb9f56efa..3651759bc3 100755 --- a/regress/scripts/cleanup +++ b/regress/scripts/cleanup @@ -8,4 +8,11 @@ rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out rm -rf /tmp/sed_tmp /tmp/file-list rm -rf tmp/build tmp/restore-list tmp/restore2-list rm -rf tmp/fd.out tmp/dir.out tmp/sd.out -rm -rf working/log +rm -rf working/log tmp/TEST-* + +bin/bacula stop 2>&1 >/dev/null +cd bin +./drop_bacula_tables >/dev/null 2>&1 +./make_bacula_tables >/dev/null 2>&1 +./grant_bacula_privileges >/dev/null 2>&1 +cd .. diff --git a/regress/scripts/cleanup-2tape.in b/regress/scripts/cleanup-2tape.in index 06583b5f69..70e6b7b0f0 100755 --- a/regress/scripts/cleanup-2tape.in +++ b/regress/scripts/cleanup-2tape.in @@ -2,9 +2,7 @@ # # Cleanup left over files -- both before and after test run # -rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small* -rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume* -rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out +scripts/cleanup if ! test x@autochanger@ = x/dev/null; then drive=`bin/mtx-changer @autochanger@ loaded` diff --git a/regress/scripts/cleanup-tape.in b/regress/scripts/cleanup-tape.in index debc2a9840..98ed537766 100755 --- a/regress/scripts/cleanup-tape.in +++ b/regress/scripts/cleanup-tape.in @@ -2,9 +2,7 @@ # # Cleanup left over files -- both before and after test run # -rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small* -rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume* -rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out +scripts/cleanup mt -f @tape_drive@ rewind mt -f @tape_drive@ weof diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index 47a2d3b820..e999a521fc 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -51,7 +51,7 @@ chmod 777 ${cwd}/bin/mtx-changer if test x`uname` = xLinux ; then \ cp -f scripts/linux_tape_options bin/tape_options ; \ fi -if test x`uname` = xFreeBsd ; then \ +if test x`uname` = xFreeBSD ; then \ cp -f scripts/freebsd_tape_options bin/tape_options ; \ fi diff --git a/regress/scripts/freebsd_tape_options b/regress/scripts/freebsd_tape_options index 8ae713fa38..05be3449c4 100644 --- a/regress/scripts/freebsd_tape_options +++ b/regress/scripts/freebsd_tape_options @@ -1,3 +1,6 @@ +# +# FreeBSD tape drive options +# Hardware End of Medium = no Fast Forward Space File = no BSF at EOM = yes diff --git a/regress/scripts/linux_tape_options b/regress/scripts/linux_tape_options index 7164059493..601eb82aa5 100644 --- a/regress/scripts/linux_tape_options +++ b/regress/scripts/linux_tape_options @@ -1 +1 @@ -# nothing needed +# nothing needed for Linux diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in index a9081e9eca..d1c849f6d1 100644 --- a/regress/scripts/new-test-bacula-dir.conf.in +++ b/regress/scripts/new-test-bacula-dir.conf.in @@ -308,4 +308,5 @@ Pool { AutoPrune = yes # Prune expired volumes Volume Retention = 365d # one year Accept Any Volume = yes # write on any volume in the pool +# Label Format = "TEST-${Year}-${Month:p/2/0/r}-${Day:p/2/0/r}:${NumVols}" } diff --git a/regress/tape b/regress/tape new file mode 100755 index 0000000000..718cefe7d5 --- /dev/null +++ b/regress/tape @@ -0,0 +1,2 @@ +#!/bin/sh +./all-non-root-tape-tests diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test new file mode 100755 index 0000000000..ef2ae58c84 --- /dev/null +++ b/regress/tests/auto-label-test @@ -0,0 +1,64 @@ +#!/bin/sh +# +# Test if Bacula can automatically create a Volume label. +# +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 + +echo " " +echo " " +echo " === Starting auto-label-test ===" +echo " === Starting auto-label-test ===" >>working/log +echo " " + +bin/bacula start 2>&1 >/dev/null +bin/bconsole -c bin/bconsole.conf <&1 >/dev/null +grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null +bstat=$? +grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null +rstat=$? +diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null +if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then + echo " " + echo " " + echo " !!!!! auto-label-test failed!!! !!!!! " + echo " !!!!! auto-label-test failed!!! !!!!! " >>test.out + echo " " +else + echo " ===== auto-label-test OK ===== " + echo " ===== auto-label-test OK ===== " >>test.out + scripts/cleanup +fi diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape index ac2df5d89d..bcfb042745 100755 --- a/regress/tests/backup-bacula-tape +++ b/regress/tests/backup-bacula-tape @@ -5,15 +5,10 @@ # we can correctly append to a tape. # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null scripts/copy-tape-confs scripts/cleanup-tape + echo "${cwd}/build" >/tmp/file-list -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " @@ -38,13 +33,18 @@ restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done yes wait messages -@# -@# Now do a second backup -@# +END_OF_DATA +bin/bacula stop 2>&1 >/dev/null +# +# Now do a second backup after making a few changes +# +touch ${cwd}/build/src/dird/*.c +echo "test test" > ${cwd}/build/src/dird/xxx +bin/bacula start 2>&1 >/dev/null +bin/bconsole -c bin/bconsole.conf <&1 >/dev/null grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null bstat=$? diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index c9f038d1d6..6c52b3240c 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -6,12 +6,6 @@ cwd=`pwd` scripts/copy-confs scripts/cleanup -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges >/dev/null 2>&1 -cd .. echo " " echo " " diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index 3bf459dbef..e3b0f740c9 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -8,12 +8,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index 367f3bcaeb..0709a1c340 100755 --- a/regress/tests/bscan-tape +++ b/regress/tests/bscan-tape @@ -6,15 +6,10 @@ # It should require at least 4 different bsrs. # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null scripts/copy-tape-confs scripts/cleanup-tape echo "${cwd}/build" >/tmp/file-list -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. + 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 @@ -106,7 +101,7 @@ 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 /dev/nst0 2>&1 >/dev/null +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 </tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index 82eb76e541..7736ae1006 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -10,12 +10,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/btape-fill-full-tape b/regress/tests/btape-fill-full-tape new file mode 100755 index 0000000000..a2d5b5a281 --- /dev/null +++ b/regress/tests/btape-fill-full-tape @@ -0,0 +1,34 @@ +#!/bin/sh +# +# Test the fill command in btape +# +cwd=`pwd` +scripts/copy-tape-confs +scripts/cleanup-tape + +echo " " +echo " " +echo " === Starting btape fill test ===" +echo " === Starting btape fill test ===" >>working/log +echo " " + +bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >tmp/log1.out +fill +s + +quit +END_OF_DATA + + +grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null +if [ $? != 0 ] ; then + echo " " + echo " " + echo " !!!!! btape fill test failed!!! !!!!! " + echo " !!!!! btape fill test failed!!! !!!!! " >>test.out + echo " " +else + echo " ===== btape fill test OK ===== " + echo " ===== btape fill test OK ===== " >>test.out +# scripts/cleanup +fi diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape index 37d5bd5413..68a99124ec 100755 --- a/regress/tests/btape-fill-tape +++ b/regress/tests/btape-fill-tape @@ -3,15 +3,11 @@ # Test the fill command in btape # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null scripts/copy-tape-confs scripts/cleanup-tape + echo "${cwd}/build" >/tmp/file-list -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. + cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 sed "s%# MaximumVolumeSize% MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index d600c1e19a..13176050da 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -7,12 +7,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index 1877e0b200..c1861a3baf 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -22,12 +22,6 @@ else fi echo "largefile created" -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test index 2e40a3f04e..2c27330ddc 100755 --- a/regress/tests/decremental-test +++ b/regress/tests/decremental-test @@ -13,12 +13,6 @@ cd ${cwd}/tmp echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list cd ${cwd} -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape index 4bfd9ad258..61f923ff4a 100755 --- a/regress/tests/fixed-block-size-tape +++ b/regress/tests/fixed-block-size-tape @@ -5,15 +5,9 @@ # sizes. # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null scripts/copy-tape-confs scripts/cleanup-tape -echo "${cwd}/build" >/tmp/file-list -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. + cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 echo "s%# Maximum Block Size% Maximum Block Size%" >${cwd}/tmp/2 echo "s%# Minimum Block Size% Minimum Block Size%" >>${cwd}/tmp/2 diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index 089f28696a..48109cbb84 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -3,14 +3,9 @@ # Run two jobs at the same time # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. scripts/copy-tape-confs scripts/cleanup-tape + echo "${cwd}/build" >/tmp/file-list echo " " diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index fbcf54798d..54a74fc142 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -6,12 +6,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index 71895e9737..9d930bf258 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -5,12 +5,6 @@ # It should require at least 4 different bsrs. # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. scripts/copy-tape-confs scripts/cleanup-tape diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index 65edb56c2d..a312b386e6 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -8,12 +8,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape index 88b4d86980..602df9cd60 100755 --- a/regress/tests/incremental-tape +++ b/regress/tests/incremental-tape @@ -4,12 +4,6 @@ # new files, do an Incremental and restore those two files. # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. scripts/copy-tape-confs scripts/cleanup-tape diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index af4b922e53..7cc54ccf82 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -13,12 +13,6 @@ cd ${cwd}/tmp echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list cd ${cwd} -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/query-test b/regress/tests/query-test index 7f371ff2e6..9bec874ac3 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -14,12 +14,6 @@ cd ${cwd}/tmp echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list cd ${cwd} -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index d20ff409c6..aa87753624 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -9,12 +9,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape index 10959cdd3f..21013b36cd 100755 --- a/regress/tests/restore-by-file-tape +++ b/regress/tests/restore-by-file-tape @@ -7,16 +7,11 @@ # are created during each of the two backups. # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null scripts/copy-tape-confs scripts/cleanup-tape echo "${cwd}/build" >/tmp/file-list sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. + 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 diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index a0263631f6..2740ea56c6 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -15,12 +15,6 @@ cd .. sed s%\^%${cwd}/tmp/build/% 1 >restore-list rm -f 1 cd ${cwd} -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 0b110bbc25..4a0514b669 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -26,12 +26,6 @@ cd ${cwd} rm -rf ${cwd}/tmp/build mkdir ${cwd}/tmp/build cp -fp ${cwd}/build/src/dird/* ${cwd}/tmp/build -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. # Enable MaximumFileSize 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 diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test index 23570c1900..53a259889b 100755 --- a/regress/tests/restore2-by-file-test +++ b/regress/tests/restore2-by-file-test @@ -8,12 +8,6 @@ scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index 8beaeb8d67..61e6dff9ef 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -16,12 +16,6 @@ echo "${cwd}/tmp/largefile" >/tmp/file-list echo "Creating a 56MB file with random data ..." dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 echo "largefile created" -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape index 1d63936c90..4c2b2487dd 100755 --- a/regress/tests/small-file-size-tape +++ b/regress/tests/small-file-size-tape @@ -4,15 +4,10 @@ # to a tape where the maximum tape file size is set to 1M # cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null scripts/copy-tape-confs scripts/cleanup-tape + echo "${cwd}/build" >/tmp/file-list -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. 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 diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index 6e1682efe6..e8127501ff 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -9,12 +9,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index 1ae38cbba7..996d3ce8d1 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -8,11 +8,6 @@ scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index 40c84b83b0..682fa052e6 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -7,12 +7,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index 2828ea19fa..aee240cfd4 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -7,12 +7,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 8297135caa..c7b32dc4ac 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -7,12 +7,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index eea92ce232..9d5e13db1e 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -7,12 +7,6 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup echo "${cwd}/build" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index 00c5fb3734..5ec98880f2 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -19,12 +19,6 @@ scripts/cleanup # echo "${cwd}/weird-files" >/tmp/file-list echo "${cwd}/weird-files" >>/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " " diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index e44bcb6c6d..b3c5fda965 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -14,12 +14,6 @@ scripts/cleanup rm -rf weird-files2 cp -Rp weird-files weird-files2 echo "${cwd}/weird-files2" >/tmp/file-list -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. echo " " echo " "