Add changes

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 6d228421508743a04fcbfed9b3818b6d38264f13..ef308a90bdadcf8d0dbb9ebc6b609cd299e80828 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -31,9 +31,11 @@ bacula: all sed
         fi)
        rm -rf tmp working
        mkdir tmp working
+       echo "Doing: scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}"
        scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}
 
 sed:
+       echo "Doing: scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}"
        scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
 
 # Run all non-root userid tests

diff --git a/regress/all-tape-and-file-tests b/regress/all-tape-and-file-tests
index 62573465e206079166ebf95d013b7b6798ee4ce1..9235dc996b7b5ac0627f974caf377020416d6085 100755 (executable)
--- a/regress/all-tape-and-file-tests
+++ b/regress/all-tape-and-file-tests
@@ -3,6 +3,7 @@
 # Run all tests
 #
 ./all-non-root-tests
+./endtime
 if [ ! -e bin/tape_options ] ; then
   touch bin/tape_options
 fi

diff --git a/regress/do_all b/regress/do_all
index ad511a4a7d47fbe8da5487f80832f6cddecaec62..ba1ad3f83ab4b39f4f9377a4afd202106e756adf 100755 (executable)
--- a/regress/do_all
+++ b/regress/do_all
@@ -6,6 +6,7 @@ if [ ! -e bin/tape_options ] ; then
   touch bin/tape_options
 fi
 ./all-tape-and-file-tests
+./endtime
 if [ ! -e bin/tape_options ] ; then
   touch bin/tape_options
 fi

diff --git a/regress/scripts/check_for_zombie_jobs b/regress/scripts/check_for_zombie_jobs
index 5fae9d3e7f68fb1389f51d5cba2dc64f892f0b0a..1542f0f667464913b9ff82678a10a301fc660635 100755 (executable)
--- a/regress/scripts/check_for_zombie_jobs
+++ b/regress/scripts/check_for_zombie_jobs
@@ -3,7 +3,7 @@
 # Check for zombie jobs (not terminated).
 # Also scan logs for ERROR messages
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output tmp/dir.out
 status dir
 @output tmp/fd.out
@@ -49,4 +49,3 @@ if [ $? = 0 ] ; then
   echo " "
 fi
 
-

diff --git a/regress/scripts/setup b/regress/scripts/setup
index cd1d085ae78169d6afead1075c0563aa6fd43713..b8923ea429a68113715970c007ed039aaa430a5b 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -22,16 +22,30 @@ cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache
 # Remove files that may be too big
-cd doc/latex
-make clean
-cd ../latex-fr
-make clean
-cd ../images
-rm -f *.png *.jpg *.gif *.eps
-rm -rf hires
+cd doc
+if [ -d latex ] ; then
+   cd latex
+   make clean
+   cd ..
+fi
+if [ -d latex-fr ] ; then
+   cd latex-fr
+   make clean
+   cd ..
+fi
+if [ -d images ] ; then
+   cd images
+   rm -f *.png *.jpg *.gif *.eps
+   rm -rf hires
+   cd ..
+fi
 cd ${cwd}/build
-cd rescue/linux/cdrom/cdtree
-rm -rf bacula-*
+if [ -d rescue/linux/cdrom/cdtree ] ; then
+   cd rescue/linux/cdrom/cdtree
+   rm -rf bacula-*
+   cd ..
+   rm -rf bootcd.iso
+fi 
 cd ${cwd}/build
 # Run Bacula configuration, make, install
 ./regress-config ${cwd} $2 $3 $4

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index 4d2d9dc1d7fd7377f151b2b73b463801c6811114..aa8e56f2fe396275a1ce20d1a00576be533b5a43 100755 (executable)
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -17,7 +17,7 @@ echo " === Starting auto-label-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 status all
 status all

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index a8343e0a3c43cf150af3fcc0d38836d0e53bc361..7b6a0bebfa246c8c3428ed4454c42b6d91fa04e3 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -17,7 +17,7 @@ echo " === Starting Backup Bacula tape test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -75,7 +75,7 @@ bin/bacula stop 2>&1 >/dev/null
 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 <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index 50a20688693f93a9638a667503dd0f5424d00c83..0c1763d012ce4d5d15e0510f2019ba2dcdaecd9f 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -15,7 +15,7 @@ echo " "
 
 bin/bacula start 2>&1 >/dev/null
 #bin/bacula start
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 60b2aa2f51632564a967f6e7c9a55ebedcbe8831..1d5383c9bd95a530c00f36d61df8c4fb4a6f0433 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -16,7 +16,7 @@ echo " === Starting bextract-test at `date +%R:%S` ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index 081e9e8504531e024db4c5d6f566e57c0f6daa36..455fb052b1a5a81accb7ccce0a39e2685e8f492e 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -63,7 +63,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -80,7 +80,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -104,7 +104,7 @@ 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 <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log2.out

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 1a9644af4c8ee377e3a7901a83c90162bc445e48..bc458251bdd02bb558fb52cdc056ce8c2076af4c 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -17,7 +17,7 @@ echo " === Starting bscan-test at `date +%R:%S` ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -48,7 +48,7 @@ bin/bacula stop 2>&1 >/dev/null
 echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr
 bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log2.out

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index c1724e855d0e6864bab5a4f5a87f6e01b0e4ddf3..2261d199cd4b14fbf985ed5a787d47eed43c5377 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -18,7 +18,7 @@ echo " === Starting bsr-opt-test at `date +%R:%S` ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 479634c5eea0cd2f94a3bebc85e8180fb268081b..c373a5878529ba513c071229821ebc594a132812 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -16,7 +16,7 @@ echo " "
 
 bin/bacula start 2>&1 >/dev/null
 exit
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @tee /dev/null
 status all
 status all

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 50da295770e542d465800b7fda8cdec9d7cb7b93..dafddc588081cf8707ad461b937c9877b2ef8d0d 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -30,7 +30,7 @@ echo " === Starting concurrent-jobs-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/decremental-test b/regress/tests/decremental-test
index 0b2a88635924d6b79ebb14b4149155b9fd49dfe9..865001e4e70d426023435c7de7feb4f2a1be6fe2 100755 (executable)
--- a/regress/tests/decremental-test
+++ b/regress/tests/decremental-test
@@ -21,7 +21,7 @@ echo " === Starting decremental-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -35,7 +35,7 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -48,7 +48,7 @@ messages
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape
index 48a3394c1c42b1b3b2aa9556cf3ce8cdb1bbb332..ab994ad16452e7b3aa1ce89b72c4c5ddc7ea092d 100755 (executable)
--- a/regress/tests/fixed-block-size-tape
+++ b/regress/tests/fixed-block-size-tape
@@ -29,7 +29,7 @@ echo " === Starting Fixed Block Size test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 456f9be1d909eaf03301034214768b93bfc1cd3d..47ea37d0e63c11683892832bdddf1c609fba19ed 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -15,7 +15,7 @@ echo " === Starting four-concurrent-jobs-tape at `date +%R:%S` ===" >>working/lo
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index a7d2508fbf3f3be533071c0fc69ea0c1f6e945b3..95d1368525c4387dc50a226460d50038c5f4044a 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -14,7 +14,7 @@ echo " === Starting four-concurrent-jobs-test at `date +%R:%S` ===" >>working/lo
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index 5c389e60831a26fcb73e5a2a0e60d408abae1188..f78cd840a9b9f7d24f325a99be29f7eaea03154b 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -17,7 +17,7 @@ echo " === Starting four-jobs-tape at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 estimate job=NightlySave listing
 estimate job=NightlySave listing
@@ -39,7 +39,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a second job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -55,7 +55,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -71,7 +71,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -85,7 +85,7 @@ echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 restore where=${cwd}/tmp/bacula-restores select all done
 yes

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index befb589a7f531d47cfffd8ba7beb09561f02f98e..ec9eb536488662f893b41c971e7dd8f2b6c1d01b 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -16,7 +16,7 @@ echo " === Starting four-jobs-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 estimate job=CompressedTest listing
 estimate job=CompressedTest listing
@@ -38,7 +38,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a second job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -55,7 +55,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a third job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -72,7 +72,7 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 #
 # run a fourth job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -87,7 +87,7 @@ echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 34dbc792a60b3399bf5e5aecb3807114f8f2d8fe..44618f9724d5bffce379e4e53c12955dbd35cf77 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -24,7 +24,7 @@ echo " === Starting incremental-tape test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -37,7 +37,7 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 4d5ea6c4e0dd31e8af56097107aa958c95fa412f..b7345e95d309becf22ad4fdb7a4ce7c04769073b 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -21,7 +21,7 @@ echo " === Starting incremental-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -39,7 +39,7 @@ scripts/check_for_zombie_jobs storage=File
 sleep 1
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 cp -f ${cwd}/tmp/build/dird.c ${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -53,7 +53,7 @@ END_OF_DATA
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -68,7 +68,7 @@ cp -f ficheriro2.txt 1
 sed "s%a%b%g" 1 >ficheriro2.txt
 rm -f 1
 cd ${cwd}
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -80,7 +80,7 @@ END_OF_DATA
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -92,7 +92,7 @@ END_OF_DATA
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -104,7 +104,7 @@ END_OF_DATA
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -116,7 +116,7 @@ END_OF_DATA
 sleep 1
 touch ${cwd}/tmp/build/ficheriro1.txt
 touch ${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/query-test b/regress/tests/query-test
index f5dc74d51b448d027aaa0390be6695884deabf0a..20c459e62a579914280365f16783233909e4afe3 100755 (executable)
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -22,7 +22,7 @@ echo " === Starting query-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -36,7 +36,7 @@ END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -49,7 +49,7 @@ messages
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=File
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

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

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 3378dc0b1d09b41efe1d54201b4bab192f2e875b..c95f5ae763cad9c81f4b40ea16f403b0719a66dc 100755 (executable)
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -22,7 +22,7 @@ echo " === Starting restore-by-file-tape test at `date +%R:%S` ===" >>working/lo
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -74,7 +74,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 #
 # Now do a second backup and restore
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 0c88b9fd5ccb60bf9a46e6e06b98221edb385884..b4a39c963b0ab8e36d1b279faccce099cd306838 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -23,7 +23,7 @@ echo " === Starting restore-by-file-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test
index 87cf6d52f11d03b5c0b16267994d4653c597d3ff..3e7f171e83c29b5fecc8d280ec9e88ddc933c237 100755 (executable)
--- a/regress/tests/restore-disk-seek-test
+++ b/regress/tests/restore-disk-seek-test
@@ -37,7 +37,7 @@ echo " === Starting restore-disk-seek-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start -v -v 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 8393abaac6f16992d4395637b09e6a156fc5d64d..cfbf2cbc83243bbffd07de0845b4478fcfa3236b 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -16,7 +16,7 @@ echo " === Starting restore2-by-file-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 57f0b6f302b090ecc644bdeca6113f6374b8e3ad..bdf6f846dc953e7ff8a87af44896f5f73b86baf6 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -24,7 +24,7 @@ echo " === Starting six-vol-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 214d84d864f0a2f85c8ffab108c270f7fc92fff0..1b3410d6a37847989ae1c36840f1459735932ae2 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -18,7 +18,7 @@ echo " === Starting Small File Size test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 7f5262759ef36d3b1baba2c0087dc8c7f5d9ad74..d4abc69450e90ca572dad196b72b97b00158151e 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -17,7 +17,7 @@ echo " === Starting span-vol-test at `date +%R:%S` ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index 449f82c639324a4a3e5852332ea8faecaa96fe05..dde29ece61724beab1eac131531adefc4e909d3a 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -16,7 +16,7 @@ echo " === Starting sparse-compressed-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index 0ce25c6fde2717d5f3221ade14195f75f7ca64ce..0e01188d6c2b42b1fd3f8074445d2698586837dc 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -15,7 +15,7 @@ echo " === Starting sparse-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape
index 9e581388d7fb860737bea5abc83e0c4a8ea6942b..6ade802a9f35326af012c66b8b0b34bbeb4c387a 100755 (executable)
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -15,7 +15,7 @@ echo " === Starting truncate-bug-tape test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -38,7 +38,7 @@ messages
 quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -60,7 +60,7 @@ messages
 quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log2.out

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 2b0d986f764db16e1a82a31e3085913d1d19a662..87683624648fdfaed477ac625fae256e7976269c 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -15,7 +15,7 @@ echo " === Starting two-jobs-test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 setdebug level=15  storage=File
 @output /dev/null
 messages
@@ -37,7 +37,7 @@ touch ${cwd}/build/src/dird/*.c
 #
 # run a second job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 223e953830fee062b918579793c202f4b227c902..f7a9694a919f924d378e812f4d9b04d38986c125 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -15,7 +15,7 @@ echo " === Starting two-vol-test at `date +%R:%S` ===" >working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 8c28f19dc5a4c0d63d74abe47fecc65d8e1b1e25..b7acfb3bb065e6db3255ea71f5b6b282da44cd46 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -24,7 +24,7 @@ echo " === Starting Two Volume Tape test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 1f050ce65c62de5eb5a39bae06eccbb346b3852c..e464d3af4735ef82863925ac86c0426b6488ddad 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -15,7 +15,7 @@ echo " === Starting verify Volume Test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 6af487d530344d10e843b0802662ad45048b3e63..2cbd5f263ea9ddbf4eb30ff3864d7bfe494a76f2 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -27,7 +27,7 @@ echo " === Starting weird filenames test at `date +%R:%S` ===" >>working/log
 echo " "
 
 bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 07fa31956cfc1397acc86946a5b239baac92f210..709f3e06f0b58e70f4c65a8052e77e04d59c5a61 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -24,7 +24,7 @@ echo " "
 bin/testls weird-files2 >${cwd}/tmp/original
 bin/bacula start
 # bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -45,7 +45,7 @@ ln hard-file3 hard-file2
 rm -f soft-file2
 ln -s soft-file3 soft-file2
 cd ${cwd}
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA 2>&1 >/dev/null
 @output /dev/null
 messages
 @#