Update 2drive-incremental-2tape script

[bacula/bacula] / regress / Makefile.in

diff --git a/regress/Makefile.in b/regress/Makefile.in
index d9435f914a5db270dfc2926a0efc92cc3bde38de..be5940ace07dace9182b95d04cf75534f7ca9bb2 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -18,21 +18,25 @@ first_rule: all
 
 all:
 
-setup: bacula
+setup: bacula sed
 
 # 
 # Some machines cannot handle the sticky bit and other garbage that
 #  is in weird-files, so we load and run it only on Linux machines.
 #
-bacula: all   
+bacula: all
        @rm -rf bin build weird-files tmp
        (if test x`uname` = xLinux -o x`uname` = xFreeBSD ; then \
           tar xfz weird-files.tar.gz ;\
         fi)
        rm -rf tmp working
        mkdir tmp working
-       scripts/setup ${BACULA_SOURCE} ${DEPKGS} ${EMAIL} 
-       scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
+       echo "Doing: scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${OPENSSL}"
+       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${SMTP_HOST} ${OPENSSL}
+
+sed:
+       echo "Doing: scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1} ${SMTP_HOST}"
+       scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1} ${SMTP_HOST}
 
 # Run all non-root userid tests
 test: 
@@ -49,10 +53,11 @@ root_test:
 clean:
        scripts/cleanup
        rm -f /tmp/file-list
-       rm -f tmp/* working/*
+       rm -fr tmp/* working/*
        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 rm -rf {} \;
 
 # Reset our userid after running as root
 reset: