Fix Makefile

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index a095af158f5cece0c4eaa68039a5ae7297232e74..dbb6c3b5b51810572377a8033ee94ca74900429b 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -33,7 +33,7 @@ bacula: all
         fi)
        rm -rf tmp working
        mkdir tmp working
-       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB}
+       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}
        scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
 
 # Run all non-root userid tests
@@ -55,6 +55,7 @@ clean:
        rm -f test.out
        rm -f diff
        rm -f 1 2 3 scripts/1 scripts/2 scripts/3 tests/1 tests/2 tests/3
+       @find . -name .#* -exec $(RMF) {} \;
 
 # Reset our userid after running as root
 reset:

diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests
index 5f47e071cdf715c49711bf53f2fae7bca6f57571..a3b69bff5220cf94f2378bf0bf88eecaf99255df 100755 (executable)
--- a/regress/all-non-root-tape-tests
+++ b/regress/all-non-root-tape-tests
@@ -2,6 +2,7 @@
 #
 # Run all tape tests
 #
+cp test.out test1.out
 tests/test0
 tests/backup-bacula-tape
 tests/small-file-size-tape

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index 0657199401f01de66943febd7ffc2933bfba66e4..5c389e60831a26fcb73e5a2a0e60d408abae1188 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -18,12 +18,12 @@ echo " "
 
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 estimate job=NightlySave listing
 estimate job=NightlySave listing
 estimate job=NightlySave listing
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
@@ -40,9 +40,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 # run a second job
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 run job=NightlySave level=Incremental yes
 wait
 messages
@@ -56,9 +56,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 # run a third job
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 run job=NightlySave level=Incremental yes
 wait
 messages
@@ -72,9 +72,9 @@ touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
 # run a fourth job
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 run job=NightlySave level=Incremental yes
 wait
 messages
@@ -86,14 +86,14 @@ echo "Backup 4 done"
 # now do several restores to ensure we cleanup between jobs
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
-@tee tmp/log2.out
+@output tmp/log2.out
 @#
 @# now unmount the tape and start two restores
 @#  at the same time
@@ -109,7 +109,7 @@ yes
 mount storage=DDS-4
 wait
 messages
-@tee
+@output
 quit
 END_OF_DATA
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape
index 7b7960446c0d0d4ffb44b9e373844ffa54a29d12..9e581388d7fb860737bea5abc83e0c4a8ea6942b 100755 (executable)
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -14,12 +14,11 @@ echo " === Starting truncate-bug-tape test at `date +%R:%S` ==="
 echo " === Starting truncate-bug-tape test at `date +%R:%S` ===" >>working/log
 echo " "
 
-#bin/bacula start 2>&1 >/dev/null
-bin/bacula start
+bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0
 @# do a bunch of saves so we have 12 files on the tape
 run job=NightlySave yes
@@ -40,9 +39,9 @@ quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 @# 
 @# now do a restore
 @#
@@ -57,14 +56,14 @@ done
 yes
 wait
 messages
-@tee
+@output
 quit
 END_OF_DATA
 scripts/check_for_zombie_jobs storage=DDS-4
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+@output /dev/null
 messages
-@tee tmp/log2.out
+@output tmp/log2.out
 run level=Full job=NightlySave yes
 wait
 messages