From 0036cd002c141fd565d6ed1f6d6e76c7fe925bd3 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 7 May 2005 12:56:07 +0000 Subject: [PATCH] Add changes git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2003 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/Makefile.in | 2 ++ regress/all-tape-and-file-tests | 1 + regress/do_all | 1 + regress/scripts/check_for_zombie_jobs | 3 +-- regress/scripts/setup | 32 ++++++++++++++++++------- regress/tests/auto-label-test | 2 +- regress/tests/backup-bacula-tape | 4 ++-- regress/tests/backup-bacula-test | 2 +- regress/tests/bextract-test | 2 +- regress/tests/bscan-tape | 6 ++--- regress/tests/bscan-test | 4 ++-- regress/tests/bsr-opt-test | 2 +- regress/tests/compressed-test | 2 +- regress/tests/concurrent-jobs-test | 2 +- regress/tests/decremental-test | 6 ++--- regress/tests/fixed-block-size-tape | 2 +- regress/tests/four-concurrent-jobs-tape | 2 +- regress/tests/four-concurrent-jobs-test | 2 +- regress/tests/four-jobs-tape | 10 ++++---- regress/tests/four-jobs-test | 10 ++++---- regress/tests/incremental-tape | 4 ++-- regress/tests/incremental-test | 16 ++++++------- regress/tests/query-test | 6 ++--- regress/tests/recycle-test | 2 +- regress/tests/restore-by-file-tape | 4 ++-- regress/tests/restore-by-file-test | 2 +- regress/tests/restore-disk-seek-test | 2 +- regress/tests/restore2-by-file-test | 2 +- regress/tests/six-vol-test | 2 +- regress/tests/small-file-size-tape | 2 +- regress/tests/span-vol-test | 2 +- regress/tests/sparse-compressed-test | 2 +- regress/tests/sparse-test | 2 +- regress/tests/truncate-bug-tape | 6 ++--- regress/tests/two-jobs-test | 4 ++-- regress/tests/two-vol-test | 2 +- regress/tests/two-volume-tape | 2 +- regress/tests/verify-vol-test | 2 +- regress/tests/weird-files-test | 2 +- regress/tests/weird-files2-test | 4 ++-- 40 files changed, 92 insertions(+), 75 deletions(-) diff --git a/regress/Makefile.in b/regress/Makefile.in index 6d22842150..ef308a90bd 100644 --- 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 62573465e2..9235dc996b 100755 --- 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 ad511a4a7d..ba1ad3f83a 100755 --- 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 5fae9d3e7f..1542f0f667 100755 --- 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 <&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 cd1d085ae7..b8923ea429 100755 --- 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 4d2d9dc1d7..aa8e56f2fe 100755 --- 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 <&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 a8343e0a3c..7b6a0bebfa 100755 --- 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 <&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 <&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 50a2068869..0c1763d012 100755 --- 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 <&1 >/dev/null <&1 >/dev/null @output /dev/null messages @output tmp/log1.out diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test index 60b2aa2f51..1d5383c9bd 100755 --- 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 <&1 >/dev/null @output /dev/null messages @output tmp/log1.out diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index 081e9e8504..455fb052b1 100755 --- 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 <&1 >/dev/null +bin/bconsole -c bin/bconsole.conf <&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 <&1 >/dev/null +bin/bconsole -c bin/bconsole.conf <&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 <&1 >/dev/null @output /dev/null messages @output tmp/log2.out diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test index 1a9644af4c..bc458251bd 100755 --- 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 <&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 <&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 c1724e855d..2261d199cd 100755 --- 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 <&1 >/dev/null @output /dev/null messages @output tmp/log1.out diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test index 479634c5ee..c373a58785 100755 --- 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 <&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 50da295770..dafddc5880 100755 --- 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 <&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 0b2a886359..865001e4e7 100755 --- 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 <&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 <&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 <&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 48a3394c1c..ab994ad164 100755 --- 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 <&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 456f9be1d9..47ea37d0e6 100755 --- 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 <&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 a7d2508fbf..95d1368525 100755 --- 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 <&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 5c389e6083..f78cd840a9 100755 --- 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 <&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 <&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 <&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 <&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 <&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 befb589a7f..ec9eb53648 100755 --- 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 <&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 <&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 <&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 <&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 <&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 34dbc792a6..44618f9724 100755 --- 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 <&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 <&1 >/dev/null @output /dev/null messages @output tmp/log1.out diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test index 4d5ea6c4e0..b7345e95d3 100755 --- 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 <&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 <&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 <&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 <&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 <&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 <&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 <&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 <&1 >/dev/null @output /dev/null messages @output tmp/log1.out diff --git a/regress/tests/query-test b/regress/tests/query-test index f5dc74d51b..20c459e62a 100755 --- 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 <&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 <&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 <&1 >/dev/null @output /dev/null messages @output tmp/log1.out diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test index de3a02dfe9..9897ead91d 100755 --- 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 <&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 3378dc0b1d..c95f5ae763 100755 --- 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 <&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 <&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 0c88b9fd5c..b4a39c963b 100755 --- 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 <&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 87cf6d52f1..3e7f171e83 100755 --- 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 <&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 8393abaac6..cfbf2cbc83 100755 --- 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 <&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 57f0b6f302..bdf6f846dc 100755 --- 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 <&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 214d84d864..1b3410d6a3 100755 --- 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 <&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 7f5262759e..d4abc69450 100755 --- 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 <&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 449f82c639..dde29ece61 100755 --- 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 <&1 >/dev/null @output /dev/null messages @output tmp/log1.out diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test index 0ce25c6fde..0e01188d6c 100755 --- 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 <&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 9e581388d7..6ade802a9f 100755 --- 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 <&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 <&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 <&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 2b0d986f76..8768362464 100755 --- 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 <&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 <&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 223e953830..f7a9694a91 100755 --- 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 <&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 8c28f19dc5..b7acfb3bb0 100755 --- 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 <&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 1f050ce65c..e464d3af47 100755 --- 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 <&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 6af487d530..2cbd5f263e 100755 --- 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 <&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 07fa31956c..709f3e06f0 100755 --- 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 <&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 <&1 >/dev/null @output /dev/null messages @# -- 2.39.2