summaryrefslogtreecommitdiff
path: root/test/tests
diff options
context:
space:
mode:
authorBruce Guenter <bruce@untroubled.org>2016-01-21 16:08:03 -0600
committerBruce Guenter <bruce@untroubled.org>2016-01-22 10:32:38 -0600
commit9819b7b97b42255e9f8f25d951d9ac91989c0066 (patch)
tree7038449f9ddcbd9017a9ebea1f1ef3a8bfbe8c02 /test/tests
parent80260ff8cf0761bfa50598fe166ca965afaa3a85 (diff)
Add a "check" make target and fix distcheck problems
Diffstat (limited to 'test/tests')
-rw-r--r--test/tests/dsn2
-rw-r--r--test/tests/mailq4
-rw-r--r--test/tests/send2
-rw-r--r--test/tests/smtpd1
4 files changed, 4 insertions, 5 deletions
diff --git a/test/tests/dsn b/test/tests/dsn
index e615eb3..5007351 100644
--- a/test/tests/dsn
+++ b/test/tests/dsn
@@ -2,7 +2,7 @@
msgid=message.id.$$.$RANDOM@f.q.d.n
dsn() {
- $srcdir/src/nullmailer-dsn "$@" << EOF
+ $builddir/src/nullmailer-dsn "$@" << EOF
sender@example.com
recip1@example.net
recip2@example.org
diff --git a/test/tests/mailq b/test/tests/mailq
index eb9cc8f..0c50ba6 100644
--- a/test/tests/mailq
+++ b/test/tests/mailq
@@ -3,8 +3,8 @@
echo "Testing the output of the mailq command"
echo To: nobody@nowhere | inject
-$srcdir/src/mailq | head -n 1 | egrep -q '^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]+ bytes from <.*>$' \
+$builddir/src/mailq | head -n 1 | egrep -q '^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]+ bytes from <.*>$' \
|| { echo "Header is misformatted."; exit 1; }
-$srcdir/src/mailq | tail -n 1 | egrep -q '^ to <nobody@nowhere.q.d.n>$' \
+$builddir/src/mailq | tail -n 1 | egrep -q '^ to <nobody@nowhere.q.d.n>$' \
|| { echo "Recipient is misformatted."; exit 1; }
diff --git a/test/tests/send b/test/tests/send
index fd68156..38496a5 100644
--- a/test/tests/send
+++ b/test/tests/send
@@ -14,7 +14,7 @@ chmod +x $tmpdir/protocols/dummy
echo 127.0.0.1 smtp >$SYSCONFDIR/remotes
# Start up the servers
-start send $srcdir/src/nullmailer-send
+start send $builddir/src/nullmailer-send
make_message() {
msgid=$(date +%s).$$.me
diff --git a/test/tests/smtpd b/test/tests/smtpd
index 59ca303..ff326e1 100644
--- a/test/tests/smtpd
+++ b/test/tests/smtpd
@@ -3,7 +3,6 @@
echo "Testing the nullmailer-smtpd program"
out=$tmpdir/smtpd.out.$$
-trap 'rm -f $out' EXIT
smtpd <<EOF 2>&1 | cat -v >$out
HELO