Update

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

diff --git a/regress/scripts/flist b/regress/scripts/flist
index 019eb57a0f61fca6073882a5eaf24263cb213458..77d41cca272626a5fa4ec40caad7672b1903df94 100644 (file)
--- 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 bf329d125a263c48007e4a5ce5e05980a8b72eb3..ee60c4b4b69b69501f7238f655372319939ffcc0 100755 (executable)
--- 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 bfecfaa9132e5ad2601078ac574ad2537cc17280..f6f6c3b0c0d9d3d0e96d5ee8fdef411f0e326195 100755 (executable)
--- 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 f87c7cdf1c326e4638aa48f998fb915ca5c5789e..b3cc484a4b8b2eaca51838ca754cc352e6adab54 100755 (executable)
--- 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 b7db28593db4eee80068cbade4e4d484a2023ee3..91fa8598a2c89b9b15e76551c7efba2e1a279aae 100755 (executable)
--- 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 cec9cd611fe552111e8cad3a6d4724d719b447f5..c2dfd742411049a2e3a4194fe08bd4dc99802a28 100755 (executable)
--- 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 ba0a8debcaf3731cc92b6551dc5504080b4eab71..ff92a49dc2d451454de2f16478d00d1312a76c48 100755 (executable)
--- 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 a03287550f5e7df7f04a90c54fff83d2996ea30a..26ae6fee840c3ad044f8b8c3b27c6f921efbc1e6 100755 (executable)
--- 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 652a66a6c1381cdc8cfbfd734525367980cfd1dc..4949bfe6d8e508474a12df99513c0efe7881371e 100755 (executable)
--- 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 55281032ce7012fa572963bab70e048f0af02a99..4907e8dca6629759ec8b3816c345ab1575df272a 100755 (executable)
--- 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 859745edf3b862ec0926667665fe04889234110e..e3a4495b88cf033391ac2171d2127b4b4b86f80c 100755 (executable)
--- 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 6d39fc883114b8085a2bab4b009d86be22929974..2d41eaef2dff08ca03c422d81d338bb4803b4dd4 100755 (executable)
--- 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 d841bedaa1abfbe573a4f7a7f517b9a5901cfa40..86a275ae9d740956855cfbe2c639f6cbee67d4cf 100755 (executable)
--- 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 b756ded489a318db0a734ae1095d62a997dfd811..bd7e20f8850448cd6cf32ee351124aba71058e3c 100755 (executable)
--- 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 449f74275a4b1fb9e58047563b35a56e10aa1b02..4252ba2d7eaf3f0ede77152c50134bc8a9d1090d 100755 (executable)
--- 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 ee93048a8a5dbefbd98ec3ce1e9ebd5745e8445f..20fdc05fcabb8806408f95fa9f427907ead83385 100755 (executable)
--- 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 4aaf080e21871237870304b92aa7a3aec163d1fe..80ac6ee7ee5a523c839a3f6f750b3549ef80d143 100755 (executable)
--- 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 8701602d4ea6e85556bc1914e0731fdaef8894b3..06289cd1d4df0688c835e5ec76b6b6d4d5faa583 100755 (executable)
--- 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 7efeb347795bfcb372e188d698c51c18856f301f..4f41954a2963642b5000dc5ad1614480b6270aca 100755 (executable)
--- 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 b9be5fdd8f4853a63a35600e865ea4bfbd66065e..fccf7af6468da7cd2af47cc2303967bf39c3f83b 100755 (executable)
--- 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 21bf7642ad8c0b159414978a11f6a342cc0f0d7a..2846a70fa619ac4c5f72e0c9b884002dde545ccc 100755 (executable)
--- 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 9aa0b5e5e483151b2d6531c50f02cc7f10798150..9c9b2d0ef485d75bf5a882a8a537ce6316e8f246 100755 (executable)
--- 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 5f2f057ed7d167bad549db932a5e3b2505048ef3..43b450bc6e113c49e1bd8553b39f1b73076b1fe4 100755 (executable)
--- 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 19a5514f30df8f1416f4c80de6cd630a0d57b051..244b0df2dac90e4e864d1b67fc242688a5e72d3b 100755 (executable)
--- 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 97a81f428ff54f129cbdbbb33e07a2e9c83aecec..2a1ce858c775eea614c63ced8b40a04893a26d0c 100755 (executable)
--- 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 3cb53805d0ef3cff0f2e26c9d42edde98f4f384c..16078fe63889dccb5b8b85eec9353fdb8940e5d6 100755 (executable)
--- 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 0e5a17fa15ab0017a169e38bb5502d6739735a5a..d0b64600523f6f28bf3c279f299b8e86e8186f00 100755 (executable)
--- 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 d79ab914f74ddbb61f20051ac0738ac935e5a665..6969c3c7ccd506c2530efcabeafa930e308200db 100755 (executable)
--- 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 222851bc6363e6664ee2279317f3b9625fdb1eed..c5ec6395401d5b5a1b3fdf234145ada295fb861b 100755 (executable)
--- 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 ebdd5ce4b9b9c165c5af2783215385f30ae63ddd..bcbb6bfc4deeaeded9652fc907566c8f4e9b2d3b 100755 (executable)
--- 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 70f6e3d5a37f46f68cdc2d0e01938f0f34d44344..9ff464af292a6f8d5ac520d1cbbd517aa6c38ad7 100755 (executable)
--- 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 0160275ac318cb99090553b1c40ca3ed4ebe803b..635b4dfa5284a5827f1ce173b336198c3fad5cd8 100755 (executable)
--- 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 ac38223ecea6764ac53b82336f584a2f776e2498..9c20ca02c00b942c87120a2150f121046d426984 100755 (executable)
--- 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 55adfb12195560d1ede7565b1dfc3d20dc488bab..a7ad2d591e061f8c2c74f6d8b9cf7732fa121338 100755 (executable)
--- 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 fd6bb70a0670a238ce3db64c06c4bdd191f24e7a..af899b4de04d5a42cee6fcebeca800cc480624e4 100755 (executable)
--- 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 bac826fb662b795e44472b7176bf7bd5aea261a4..96fed8932223a49901bfacee8520b37c61a98fed 100755 (executable)
--- 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 9971fd44231b29c8d5981ca3fec2b195b357bc99..ec328155dd92000853b5c5361045f0a477c31b03 100755 (executable)
--- 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