# HG changeset patch
# User markus schnalke <meillo@marmaro.de>
# Date 1338367109 -7200
# Node ID 196dfb2a3056f1fdd9547ff6ba7cdd902838a4e9
# Parent  bdbedce60247e1cc0b2e30843c15835fec40bb32
Updated tests to the changes on spool dir.

diff -r bdbedce60247 -r 196dfb2a3056 tests/hostname-stdin/makefile
--- a/tests/hostname-stdin/makefile	Wed May 30 10:27:10 2012 +0200
+++ b/tests/hostname-stdin/makefile	Wed May 30 10:38:29 2012 +0200
@@ -2,7 +2,7 @@
 # heavily based on Makefile.am written by oliver kurth
 
 all: test test.conf
-	mkdir -p ./input ./lock
+	mkdir -p spool
 
 test.conf: test.conf.tpl
 	# fails if the current path contains `^'.
@@ -16,5 +16,5 @@
 	rm -f test.conf test
 
 realclean: clean
-	rm -rf ./input ./lock
+	rm -rf spool
 	rm -f *.log $(LOGNAME)
diff -r bdbedce60247 -r 196dfb2a3056 tests/hostname-stdin/test.conf.tpl
--- a/tests/hostname-stdin/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
+++ b/tests/hostname-stdin/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
@@ -14,7 +14,7 @@
 local_hosts="SMTP_HOST"
 
 # spool into the current directory
-spool_dir="PWD"
+spool_dir="PWD/spool"
 
 # deliver local mail into the current directory
 mail_dir="PWD"
diff -r bdbedce60247 -r 196dfb2a3056 tests/localhost-stdin/makefile
--- a/tests/localhost-stdin/makefile	Wed May 30 10:27:10 2012 +0200
+++ b/tests/localhost-stdin/makefile	Wed May 30 10:38:29 2012 +0200
@@ -2,7 +2,7 @@
 # heavily based on Makefile.am written by oliver kurth
 
 all: test.conf
-	mkdir -p ./input ./lock
+	mkdir -p spool
 
 test.conf: test.conf.tpl
 	# fails if the current path contains `^'.
@@ -12,5 +12,5 @@
 	rm -f test.conf
 
 realclean: clean
-	rm -rf ./input ./lock
+	rm -rf spool
 	rm -f *.log $(LOGNAME)
diff -r bdbedce60247 -r 196dfb2a3056 tests/localhost-stdin/test.conf.tpl
--- a/tests/localhost-stdin/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
+++ b/tests/localhost-stdin/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
@@ -14,7 +14,7 @@
 local_hosts="localhost"
 
 # spool dir is the current directory
-spool_dir="PWD"
+spool_dir="PWD/spool"
 
 # deliver local mail into the current directory
 mail_dir="PWD"
diff -r bdbedce60247 -r 196dfb2a3056 tests/relay-to-hostname-mta/makefile
--- a/tests/relay-to-hostname-mta/makefile	Wed May 30 10:27:10 2012 +0200
+++ b/tests/relay-to-hostname-mta/makefile	Wed May 30 10:38:29 2012 +0200
@@ -2,7 +2,7 @@
 # heavily based on Makefile.am written by oliver kurth
 
 all: test test.conf test.route
-	mkdir -p ./input ./lock
+	mkdir -p spool
 
 test.conf: test.conf.tpl
 	# fails if the current path contains `^'.
@@ -20,5 +20,5 @@
 	rm -f test.conf test test.route
 
 realclean: clean
-	rm -rf ./input ./lock
+	rm -rf spool
 	rm -f *.log
diff -r bdbedce60247 -r 196dfb2a3056 tests/relay-to-hostname-mta/test.conf.tpl
--- a/tests/relay-to-hostname-mta/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
+++ b/tests/relay-to-hostname-mta/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
@@ -19,7 +19,7 @@
 
 
 # spool files in the current directory
-spool_dir="PWD"
+spool_dir="PWD/spool"
 
 # deliver local mails into the current directory
 mail_dir="PWD"
diff -r bdbedce60247 -r 196dfb2a3056 tests/relay-to-localhost-mta/makefile
--- a/tests/relay-to-localhost-mta/makefile	Wed May 30 10:27:10 2012 +0200
+++ b/tests/relay-to-localhost-mta/makefile	Wed May 30 10:38:29 2012 +0200
@@ -2,7 +2,7 @@
 # heavily based on Makefile.am written by oliver kurth
 
 all: test test.conf
-	mkdir -p ./input ./lock
+	mkdir -p spool
 
 test.conf: test.conf.tpl
 	# fails if the current path contains `^'.
@@ -16,5 +16,5 @@
 	rm -f test.conf test
 
 realclean: clean
-	rm -rf ./input ./lock
+	rm -rf spool
 	rm -f *.log
diff -r bdbedce60247 -r 196dfb2a3056 tests/relay-to-localhost-mta/test.conf.tpl
--- a/tests/relay-to-localhost-mta/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
+++ b/tests/relay-to-localhost-mta/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
@@ -19,7 +19,7 @@
 
 
 # spool files in the current directory
-spool_dir="PWD"
+spool_dir="PWD/spool"
 
 # deliver local mails into the current directory
 mail_dir="PWD"