changeset 340:60bb2dbe2866 0.3.3

In the tests: replaced logname(1) with $LOGNAME Because logname(1) may not work if it has no controlling terminal. See: http://aplawrence.com/cgi-bin/printer.pl?arg=/Forum/TonyLawrence8.html Be it that reason or not, it didn't work on Crux, but $LOGNAME is set.
author markus schnalke <meillo@marmaro.de>
date Wed, 31 Aug 2011 09:14:38 +0200 (2011-08-31)
parents e6864daf89f4
children 7caf6f799e99
files tests/hostname-stdin/makefile tests/hostname-stdin/test.tpl tests/localhost-stdin/makefile tests/localhost-stdin/test tests/relay-to-hostname-mta/test.tpl tests/relay-to-localhost-mta/test.tpl
diffstat 6 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tests/hostname-stdin/makefile	Wed Aug 31 08:46:00 2011 +0200
+++ b/tests/hostname-stdin/makefile	Wed Aug 31 09:14:38 2011 +0200
@@ -17,4 +17,4 @@
 
 realclean: clean
 	rm -rf ./input ./lock
-	rm -f *.log `logname`
+	rm -f *.log $(LOGNAME)
--- a/tests/hostname-stdin/test.tpl	Wed Aug 31 08:46:00 2011 +0200
+++ b/tests/hostname-stdin/test.tpl	Wed Aug 31 09:14:38 2011 +0200
@@ -3,9 +3,9 @@
 # path to the masqmail executable
 mm_bin=../../src/masqmail
 
-hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>"
+hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>"
 hto="$hfrom"
-to=`logname`@RECV_HOST
+to=$LOGNAME@RECV_HOST
 hsubject="Masqmail test: hostname-stdin"
 
 
--- a/tests/localhost-stdin/makefile	Wed Aug 31 08:46:00 2011 +0200
+++ b/tests/localhost-stdin/makefile	Wed Aug 31 09:14:38 2011 +0200
@@ -13,4 +13,4 @@
 
 realclean: clean
 	rm -rf ./input ./lock
-	rm -f *.log `logname`
+	rm -f *.log $(LOGNAME)
--- a/tests/localhost-stdin/test	Wed Aug 31 08:46:00 2011 +0200
+++ b/tests/localhost-stdin/test	Wed Aug 31 09:14:38 2011 +0200
@@ -4,9 +4,9 @@
 mm_bin=../../src/masqmail
 
 
-hfrom="\"Fritz Meier\" <`logname`@localhost>"
+hfrom="\"Fritz Meier\" <$LOGNAME@localhost>"
 hto=$hfrom
-to=`logname`@localhost
+to=$LOGNAME@localhost
 hsubject="Masqmail test: localhost-stdin"
 
 
--- a/tests/relay-to-hostname-mta/test.tpl	Wed Aug 31 08:46:00 2011 +0200
+++ b/tests/relay-to-hostname-mta/test.tpl	Wed Aug 31 09:14:38 2011 +0200
@@ -3,9 +3,9 @@
 # path to the masqmail executable
 mm_bin=../../src/masqmail
 
-hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>"
+hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>"
 hto="$hfrom"
-to=`logname`@RECV_HOST
+to=$LOGNAME@RECV_HOST
 hsubject="Masqmail test: relay-to-hostname-mta"
 
 
--- a/tests/relay-to-localhost-mta/test.tpl	Wed Aug 31 08:46:00 2011 +0200
+++ b/tests/relay-to-localhost-mta/test.tpl	Wed Aug 31 09:14:38 2011 +0200
@@ -3,9 +3,9 @@
 # path to the masqmail executable
 mm_bin=../../src/masqmail
 
-hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>"
+hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>"
 hto="$hfrom"
-to=`logname`@RECV_HOST
+to=$LOGNAME@RECV_HOST
 hsubject="Masqmail test: relay-to-localhost-mta"