Updates

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

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index 3651759bc3b4b91b96e4018080a733cf9eeb5092..bca32b328dab0afb09a06def385169ed26b1b3f2 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -9,6 +9,7 @@ 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 tmp/TEST-*
+rm -rf working/*restore*.bsr
 
 bin/bacula stop 2>&1 >/dev/null
 cd bin

diff --git a/regress/scripts/flist b/regress/scripts/flist
index aa390099d9ec8a2cc4cb5885b39e1115d0ddecb0..ba8663a362177961d1b4fc49363a720912a6efcc 100644 (file)
--- a/regress/scripts/flist
+++ b/regress/scripts/flist
@@ -1,6 +1,3 @@
-/build/doc/Makefile.in
-/build/doc/latex/bacula.tex
-/build/doc/images/win32-welcome.pdf
 /build/configure
 /build/src/stored/bextract
 /build/src/tools/testfind
@@ -16,3 +13,6 @@
 /build/src/filed/win32/bin/cygwin1.dll
 /build/src/filed/win32/winservice.cpp
 /build/src/filed/restore.c
+/build/autoconf/configure.in
+/build/examples/afs-bacula
+/build/src/win32/winbacula.nsi.in

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 0c1763d012ce4d5d15e0510f2019ba2dcdaecd9f..fd00bf7d3150b20717275b70d7eba270f84c554a 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -13,9 +13,10 @@ echo " === Starting Backup Bacula Test at `date +%R:%S` ==="
 echo " === Starting Backup Bacula Test at `date +%R:%S` ===" >>working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
-#bin/bacula start
-bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null <<END_OF_DATA 2>&1 >/dev/null
+#bin/bacula start 2>&1 >/dev/null
+bin/bacula start
+bin/bconsole -c bin/bconsole.conf  <<END_OF_DATA 2>&1 >/dev/null
+#bin/bconsole -c bin/bconsole.conf  <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 1d5383c9bd95a530c00f36d61df8c4fb4a6f0433..2702f1696f8937d3319f6fdf5741a441056532d1 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -30,7 +30,7 @@ messages
 @# now build the bsr file
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File1 done
+restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done
 no
 wait
 messages

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index 2261d199cd4b14fbf985ed5a787d47eed43c5377..d1edfd61e65ccf305afb381978c468e66402e1ab 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -32,7 +32,7 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=File1
+restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 cd ${cwd}/build/src/cats
 mark *

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index 9897ead91d39387fc5f104917e9e142a6485331c..fd1c383d84338e43cb0c8e93051e9dd4b2748a60 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -16,7 +16,8 @@ echo " === Starting recycle-test at `date +%R:%S` ==="
 echo " === Starting recycle-test at `date +%R:%S` ===" >working/log
 echo " "
 
-bin/bacula start 2>&1 >/dev/null
+#bin/bacula start 2>&1 >/dev/null
+bin/bacula start
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 2cbd5f263ea9ddbf4eb30ff3864d7bfe494a76f2..0a9bd1a908d61546c465ca7af23e0fa62b1242a1 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -28,9 +28,9 @@ echo " "
 
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
-@output /dev/null
+@tee /dev/null
 messages
-@output tmp/log1.out
+@tee tmp/log1.out
 label storage=File
 TestVolume001
 run job=NightlySave
@@ -40,7 +40,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@tee tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
@@ -48,7 +48,7 @@ done
 yes
 wait
 messages
-@output
+@tee
 quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=File 

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 709f3e06f0b58e70f4c65a8052e77e04d59c5a61..9929d99eafd997ad9afc2fac86396ac56443a08a 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -17,8 +17,8 @@ echo "${cwd}/weird-files2" >/tmp/file-list
 
 echo " "
 echo " "
-echo " === Starting weird filenames2 test at `date +%R:%S` ==="
-echo " === Starting weird filenames2 test at `date +%R:%S` ===" >>working/log
+echo " === Starting weird-files2 test at `date +%R:%S` ==="
+echo " === Starting weird-file2 test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/testls weird-files2 >${cwd}/tmp/original