masqmail

changeset 423:196dfb2a3056

find changesets by author, revision, files, or words in the commit message
Updated tests to the changes on spool dir.
author markus schnalke <meillo@marmaro.de>
date Wed, 30 May 2012 10:38:29 +0200
parents bdbedce60247
children 19be3b27df6f
files tests/hostname-stdin/makefile tests/hostname-stdin/test.conf.tpl tests/localhost-stdin/makefile tests/localhost-stdin/test.conf.tpl tests/relay-to-hostname-mta/makefile tests/relay-to-hostname-mta/test.conf.tpl tests/relay-to-localhost-mta/makefile tests/relay-to-localhost-mta/test.conf.tpl
diffstat 8 files changed, 12 insertions(+), 12 deletions(-) [+]
line diff
     1.1 --- a/tests/hostname-stdin/makefile	Wed May 30 10:27:10 2012 +0200
     1.2 +++ b/tests/hostname-stdin/makefile	Wed May 30 10:38:29 2012 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4  # heavily based on Makefile.am written by oliver kurth
     1.5  
     1.6  all: test test.conf
     1.7 -	mkdir -p ./input ./lock
     1.8 +	mkdir -p spool
     1.9  
    1.10  test.conf: test.conf.tpl
    1.11  	# fails if the current path contains `^'.
    1.12 @@ -16,5 +16,5 @@
    1.13  	rm -f test.conf test
    1.14  
    1.15  realclean: clean
    1.16 -	rm -rf ./input ./lock
    1.17 +	rm -rf spool
    1.18  	rm -f *.log $(LOGNAME)

     2.1 --- a/tests/hostname-stdin/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
     2.2 +++ b/tests/hostname-stdin/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
     2.3 @@ -14,7 +14,7 @@
     2.4  local_hosts="SMTP_HOST"
     2.5  
     2.6  # spool into the current directory
     2.7 -spool_dir="PWD"
     2.8 +spool_dir="PWD/spool"
     2.9  
    2.10  # deliver local mail into the current directory
    2.11  mail_dir="PWD"

     3.1 --- a/tests/localhost-stdin/makefile	Wed May 30 10:27:10 2012 +0200
     3.2 +++ b/tests/localhost-stdin/makefile	Wed May 30 10:38:29 2012 +0200
     3.3 @@ -2,7 +2,7 @@
     3.4  # heavily based on Makefile.am written by oliver kurth
     3.5  
     3.6  all: test.conf
     3.7 -	mkdir -p ./input ./lock
     3.8 +	mkdir -p spool
     3.9  
    3.10  test.conf: test.conf.tpl
    3.11  	# fails if the current path contains `^'.
    3.12 @@ -12,5 +12,5 @@
    3.13  	rm -f test.conf
    3.14  
    3.15  realclean: clean
    3.16 -	rm -rf ./input ./lock
    3.17 +	rm -rf spool
    3.18  	rm -f *.log $(LOGNAME)

     4.1 --- a/tests/localhost-stdin/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
     4.2 +++ b/tests/localhost-stdin/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
     4.3 @@ -14,7 +14,7 @@
     4.4  local_hosts="localhost"
     4.5  
     4.6  # spool dir is the current directory
     4.7 -spool_dir="PWD"
     4.8 +spool_dir="PWD/spool"
     4.9  
    4.10  # deliver local mail into the current directory
    4.11  mail_dir="PWD"

     5.1 --- a/tests/relay-to-hostname-mta/makefile	Wed May 30 10:27:10 2012 +0200
     5.2 +++ b/tests/relay-to-hostname-mta/makefile	Wed May 30 10:38:29 2012 +0200
     5.3 @@ -2,7 +2,7 @@
     5.4  # heavily based on Makefile.am written by oliver kurth
     5.5  
     5.6  all: test test.conf test.route
     5.7 -	mkdir -p ./input ./lock
     5.8 +	mkdir -p spool
     5.9  
    5.10  test.conf: test.conf.tpl
    5.11  	# fails if the current path contains `^'.
    5.12 @@ -20,5 +20,5 @@
    5.13  	rm -f test.conf test test.route
    5.14  
    5.15  realclean: clean
    5.16 -	rm -rf ./input ./lock
    5.17 +	rm -rf spool
    5.18  	rm -f *.log

     6.1 --- a/tests/relay-to-hostname-mta/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
     6.2 +++ b/tests/relay-to-hostname-mta/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
     6.3 @@ -19,7 +19,7 @@
     6.4  
     6.5  
     6.6  # spool files in the current directory
     6.7 -spool_dir="PWD"
     6.8 +spool_dir="PWD/spool"
     6.9  
    6.10  # deliver local mails into the current directory
    6.11  mail_dir="PWD"

     7.1 --- a/tests/relay-to-localhost-mta/makefile	Wed May 30 10:27:10 2012 +0200
     7.2 +++ b/tests/relay-to-localhost-mta/makefile	Wed May 30 10:38:29 2012 +0200
     7.3 @@ -2,7 +2,7 @@
     7.4  # heavily based on Makefile.am written by oliver kurth
     7.5  
     7.6  all: test test.conf
     7.7 -	mkdir -p ./input ./lock
     7.8 +	mkdir -p spool
     7.9  
    7.10  test.conf: test.conf.tpl
    7.11  	# fails if the current path contains `^'.
    7.12 @@ -16,5 +16,5 @@
    7.13  	rm -f test.conf test
    7.14  
    7.15  realclean: clean
    7.16 -	rm -rf ./input ./lock
    7.17 +	rm -rf spool
    7.18  	rm -f *.log

     8.1 --- a/tests/relay-to-localhost-mta/test.conf.tpl	Wed May 30 10:27:10 2012 +0200
     8.2 +++ b/tests/relay-to-localhost-mta/test.conf.tpl	Wed May 30 10:38:29 2012 +0200
     8.3 @@ -19,7 +19,7 @@
     8.4  
     8.5  
     8.6  # spool files in the current directory
     8.7 -spool_dir="PWD"
     8.8 +spool_dir="PWD/spool"
     8.9  
    8.10  # deliver local mails into the current directory
    8.11  mail_dir="PWD"