From 6a8eafaf4e7f1224125927475704534694ad4cd0 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 31 Jul 2006 14:26:12 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3210 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/flist | 2 +- regress/tests/backup-bacula-test | 2 +- regress/tests/backup-win32-tape | 2 +- regress/tests/bextract-test | 2 +- regress/tests/bscan-test | 2 +- regress/tests/bsr-opt-test | 2 +- regress/tests/compressed-test | 2 +- regress/tests/dev-test-root | 2 +- regress/tests/differential-test | 2 +- regress/tests/eot-fail-tape | 3 +-- regress/tests/etc-test-root | 2 +- regress/tests/filed-crypto-test | 2 +- regress/tests/four-concurrent-jobs-tape | 2 +- regress/tests/four-concurrent-jobs-test | 2 +- regress/tests/four-jobs-tape | 2 +- regress/tests/four-jobs-test | 2 +- regress/tests/incremental-test | 2 +- regress/tests/lib-tape-root | 2 +- regress/tests/lib-test-root | 2 +- regress/tests/migration-job-test | 2 +- regress/tests/migration-test | 2 +- regress/tests/migration-volume-test | 2 +- regress/tests/query-test | 2 +- regress/tests/recycle-test | 2 +- regress/tests/relabel-tape | 2 +- regress/tests/restore-by-file-test | 2 +- regress/tests/restore-disk-seek-test | 2 +- regress/tests/six-vol-test | 2 +- regress/tests/span-vol-test | 2 +- regress/tests/sparse-compressed-test | 2 +- regress/tests/sparse-test | 2 +- regress/tests/truncate-bug-tape | 1 + regress/tests/two-jobs-test | 2 +- regress/tests/two-vol-test | 2 +- regress/tests/verify-vol-test | 2 +- regress/tests/weird-files-test | 2 +- regress/tests/weird-files2-test | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/regress/scripts/flist b/regress/scripts/flist index 019eb57a0f..77d41cca27 100644 --- a/regress/scripts/flist +++ b/regress/scripts/flist @@ -10,7 +10,7 @@ /build/platforms/Makefile.in /build/platforms/redhat/Makefile.in /build/scripts/Makefile.in -/build/src/filed/win32/winservice.cpp +/build/src/win32/filed/winservice.cpp /build/src/filed/restore.c /build/autoconf/configure.in /build/examples/afs-bacula diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test index bf329d125a..ee60c4b4b6 100755 --- a/regress/tests/backup-bacula-test +++ b/regress/tests/backup-bacula-test @@ -8,8 +8,8 @@ JobName=backup . scripts/functions set_debug 0 -scripts/copy-confs scripts/cleanup +scripts/copy-confs change_jobname Client1 $JobName start_test diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape index bfecfaa913..f6f6c3b0c0 100755 --- a/regress/tests/backup-win32-tape +++ b/regress/tests/backup-win32-tape @@ -9,8 +9,8 @@ JobName=backupwintape . scripts/functions set_debug 0 -scripts/copy-win32-confs scripts/cleanup-tape +scripts/copy-win32-confs echo "${cwd}/build" >/tmp/file-list diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index f87c7cdf1c..b3cc484a4b 100755 --- a/regress/tests/bextract-test +++ b/regress/tests/bextract-test @@ -9,8 +9,8 @@ JobName="bextract" . scripts/functions set_debug 0 -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index b7db28593d..91fa8598a2 100755 --- a/regress/tests/bscan-test +++ b/regress/tests/bscan-test @@ -12,8 +12,8 @@ JobName=bscan set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test index cec9cd611f..c2dfd74241 100755 --- a/regress/tests/bsr-opt-test +++ b/regress/tests/bsr-opt-test @@ -11,8 +11,8 @@ JobName=bsr-opt . scripts/functions set_debug 0 -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index ba0a8debca..ff92a49dc2 100755 --- a/regress/tests/compressed-test +++ b/regress/tests/compressed-test @@ -8,8 +8,8 @@ JobName=compressed . scripts/functions set_debug 0 -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname CompressedTest $JobName diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root index a03287550f..26ae6fee84 100755 --- a/regress/tests/dev-test-root +++ b/regress/tests/dev-test-root @@ -13,8 +13,8 @@ if [ $MUID != 0 ] ; then exit 1 fi cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "/dev" >/tmp/file-list echo " " diff --git a/regress/tests/differential-test b/regress/tests/differential-test index 652a66a6c1..4949bfe6d8 100755 --- a/regress/tests/differential-test +++ b/regress/tests/differential-test @@ -8,8 +8,8 @@ JobName=differential . scripts/functions set_debug 0 -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 diff --git a/regress/tests/eot-fail-tape b/regress/tests/eot-fail-tape index 55281032ce..4907e8dca6 100755 --- a/regress/tests/eot-fail-tape +++ b/regress/tests/eot-fail-tape @@ -8,8 +8,8 @@ JobName=eotfailtape . scripts/functions set_debug 0 -scripts/copy-tape-confs scripts/cleanup-tape +scripts/copy-tape-confs echo "${cwd}/build" >/tmp/file-list @@ -49,4 +49,3 @@ stop_bacula check_two_logs check_restore_diff end_test - diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root index 859745edf3..e3a4495b88 100755 --- a/regress/tests/etc-test-root +++ b/regress/tests/etc-test-root @@ -18,8 +18,8 @@ echo " === Starting /etc save/restore test ===" echo " " echo " " cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "/etc" >/tmp/file-list bin/bacula start 2>&1 >/dev/null diff --git a/regress/tests/filed-crypto-test b/regress/tests/filed-crypto-test index 6d39fc8831..2d41eaef2d 100755 --- a/regress/tests/filed-crypto-test +++ b/regress/tests/filed-crypto-test @@ -8,8 +8,8 @@ JobName=Crypto . scripts/functions set_debug 0 -scripts/copy-crypto-confs scripts/cleanup +scripts/copy-crypto-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape index d841bedaa1..86a275ae9d 100755 --- a/regress/tests/four-concurrent-jobs-tape +++ b/regress/tests/four-concurrent-jobs-tape @@ -7,8 +7,8 @@ JobName=AutoLabel . scripts/functions set_debug 0 -scripts/copy-tape-confs scripts/cleanup-tape +scripts/copy-tape-confs echo "${cwd}/build" >/tmp/file-list diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test index b756ded489..bd7e20f885 100755 --- a/regress/tests/four-concurrent-jobs-test +++ b/regress/tests/four-concurrent-jobs-test @@ -7,8 +7,8 @@ JobName=Four-concurrent-jobs . scripts/functions set_debug 0 -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape index 449f74275a..4252ba2d7e 100755 --- a/regress/tests/four-jobs-tape +++ b/regress/tests/four-jobs-tape @@ -9,8 +9,8 @@ JobName=fourjobstape . scripts/functions set_debug 0 -scripts/copy-tape-confs scripts/cleanup-tape +scripts/copy-tape-confs echo "${cwd}/build" >/tmp/file-list change_jobname $JobName diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test index ee93048a8a..20fdc05fca 100755 --- a/regress/tests/four-jobs-test +++ b/regress/tests/four-jobs-test @@ -10,8 +10,8 @@ JobName=SpanVol set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname CompressedTest $JobName diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index 4aaf080e21..80ac6ee7ee 100755 --- a/regress/tests/incremental-test +++ b/regress/tests/incremental-test @@ -8,8 +8,8 @@ JobName=Incremental . scripts/functions set_debug 0 -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 diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root index 8701602d4e..06289cd1d4 100755 --- a/regress/tests/lib-tape-root +++ b/regress/tests/lib-tape-root @@ -11,8 +11,8 @@ cd bin ./grant_bacula_privileges 2>&1 >/dev/null cd .. -scripts/copy-tape-confs scripts/cleanup-tape +scripts/copy-tape-confs echo "/lib" >/tmp/file-list echo " " echo " " diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root index 7efeb34779..4f41954a29 100755 --- a/regress/tests/lib-test-root +++ b/regress/tests/lib-test-root @@ -13,8 +13,8 @@ if [ $MUID != 0 ] ; then exit 1 fi cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "/lib" >/tmp/file-list echo " " diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test index b9be5fdd8f..fccf7af646 100755 --- a/regress/tests/migration-job-test +++ b/regress/tests/migration-job-test @@ -12,9 +12,9 @@ set_debug 0 . config.out +scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -scripts/cleanup echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/migration-test b/regress/tests/migration-test index 21bf7642ad..2846a70fa6 100755 --- a/regress/tests/migration-test +++ b/regress/tests/migration-test @@ -12,9 +12,9 @@ set_debug 1 . config.out +scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -scripts/cleanup echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test index 9aa0b5e5e4..9c9b2d0ef4 100755 --- a/regress/tests/migration-volume-test +++ b/regress/tests/migration-volume-test @@ -12,9 +12,9 @@ set_debug 1 . config.out +scripts/cleanup scripts/copy-migration-confs scripts/prepare-two-disks -scripts/cleanup echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/query-test b/regress/tests/query-test index 5f2f057ed7..43b450bc6e 100755 --- a/regress/tests/query-test +++ b/regress/tests/query-test @@ -9,8 +9,8 @@ JobName=query . scripts/functions set_debug 0 -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 diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index 19a5514f30..244b0df2da 100755 --- a/regress/tests/recycle-test +++ b/regress/tests/recycle-test @@ -11,8 +11,8 @@ JobName=Recycle set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape index 97a81f428f..2a1ce858c7 100755 --- a/regress/tests/relabel-tape +++ b/regress/tests/relabel-tape @@ -9,8 +9,8 @@ JobName=Relabeltape . scripts/functions set_debug 0 -scripts/copy-tape-confs scripts/cleanup-tape +scripts/copy-tape-confs echo "${cwd}/build" >/tmp/file-list change_jobname $JobName diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test index 3cb53805d0..16078fe638 100755 --- a/regress/tests/restore-by-file-test +++ b/regress/tests/restore-by-file-test @@ -10,8 +10,8 @@ JobName=restorebyfile 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 diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test index 0e5a17fa15..d0b6460052 100755 --- a/regress/tests/restore-disk-seek-test +++ b/regress/tests/restore-disk-seek-test @@ -11,8 +11,8 @@ JobName=restore-disk-seek . scripts/functions set_debug 0 -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/tmp/build" >/tmp/file-list rm -rf ${cwd}/tmp/build mkdir ${cwd}/tmp/build diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index d79ab914f7..6969c3c7cc 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -13,8 +13,8 @@ if test ! -c /dev/urandom ; then exit 0 fi -scripts/copy-testa-confs scripts/cleanup +scripts/copy-testa-confs echo "${cwd}/tmp/largefile" >/tmp/file-list # Create 56MB file with random data echo "Creating a 56MB file with random data ..." diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test index 222851bc63..c5ec639540 100755 --- a/regress/tests/span-vol-test +++ b/regress/tests/span-vol-test @@ -11,8 +11,8 @@ JobName=SpanVol set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test index ebdd5ce4b9..bcbb6bfc4d 100755 --- a/regress/tests/sparse-compressed-test +++ b/regress/tests/sparse-compressed-test @@ -9,8 +9,8 @@ JobName=Sparse-conpressed set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list start_test diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index 70f6e3d5a3..9ff464af29 100755 --- a/regress/tests/sparse-test +++ b/regress/tests/sparse-test @@ -9,8 +9,8 @@ JobName=SparseTest set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list start_test diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape index 0160275ac3..635b4dfa52 100755 --- a/regress/tests/truncate-bug-tape +++ b/regress/tests/truncate-bug-tape @@ -5,6 +5,7 @@ TestName="truncate-bug-tape" JobName=truncatebug . scripts/functions + set_debug 0 copy_tape_confs diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test index ac38223ece..9c20ca02c0 100755 --- a/regress/tests/two-jobs-test +++ b/regress/tests/two-jobs-test @@ -9,8 +9,8 @@ JobName=Two-Jobs set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname CompressedTest $JobName diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index 55adfb1219..a7ad2d591e 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -9,8 +9,8 @@ JobName=TwoVol set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test index fd6bb70a06..af899b4de0 100755 --- a/regress/tests/verify-vol-test +++ b/regress/tests/verify-vol-test @@ -9,8 +9,8 @@ JobName=VerifyVol set_debug 0 cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs echo "${cwd}/build" >/tmp/file-list change_jobname NightlySave $JobName diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test index bac826fb66..96fed89322 100755 --- a/regress/tests/weird-files-test +++ b/regress/tests/weird-files-test @@ -15,8 +15,8 @@ if test ! -d weird-files ; then fi cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs change_jobname NightlySave $JobName # # Note, we save the weird-files directory twice on purpose diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index 9971fd4423..ec328155dd 100755 --- a/regress/tests/weird-files2-test +++ b/regress/tests/weird-files2-test @@ -14,8 +14,8 @@ if test ! -d weird-files ; then exit 0 fi cwd=`pwd` -scripts/copy-test-confs scripts/cleanup +scripts/copy-test-confs rm -rf weird-files2 cp -Rp weird-files weird-files2 echo "${cwd}/weird-files2" >/tmp/file-list -- 2.39.5