X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2FMakefile.in;h=be5940ace07dace9182b95d04cf75534f7ca9bb2;hb=f810a4b1ed444d3b1a94afceba72c722088b0778;hp=6eafb617016ddae4648710e80c946506c77cd0ec;hpb=d0ebc0fb9b34e25b1674a6ddeb12138beac82e6c;p=bacula%2Fbacula

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 6eafb61701..be5940ace0 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -18,51 +18,55 @@ 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   
-        @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} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}
-        scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
+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
+	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: 
-        ./all-non-root-tests
+	./all-non-root-tests
 
 # run all file and tape tests
 full_test:
-        ./all-tape-and-file-tests
+	./all-tape-and-file-tests
 
 # These tests require you to run as root
 root_test:
-        ./all-root-tests
+	./all-root-tests
 
 clean:
-        scripts/cleanup
-        rm -f /tmp/file-list
-        rm -f 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 $(RMF) {} \;
+	scripts/cleanup
+	rm -f /tmp/file-list
+	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:
-        chown -R ${USER}:${USER} . tmp working
-        scripts/cleanup
-        rm -f /tmp/file-list tmp/file-list
-        rm -f tmp/* working/*
+	chown -R ${USER}:${USER} . tmp working
+	scripts/cleanup
+	rm -f /tmp/file-list tmp/file-list
+	rm -f tmp/* working/*
 
 distclean: clean
-        rm -rf bin build weird-files weird-files weird-files2 tmp working
-        rm -f scripts/*.conf
-                      
+	rm -rf bin build weird-files weird-files weird-files2 tmp working
+	rm -f scripts/*.conf
+