summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-01-02 14:29:29 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2018-01-03 22:39:11 +0000
commit2b8b8e4ed5cbebd3884c301d438d72ea24fbfd70 (patch)
treee5d1a367e2a402207ff79dfd773d44b36a38edef /test
parent6481e12595de1b95cf9f75ddad2ae9e7c27fd150 (diff)
tidying
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.in2
-rwxr-xr-xtest/bin/locate.sh3
-rw-r--r--test/confs/46006
3 files changed, 3 insertions, 8 deletions
diff --git a/test/Makefile.in b/test/Makefile.in
index 9d145ece3..2b6c2da7d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -27,7 +27,7 @@ all: binaries sysbinaries
binaries: $(BINARIES)
sysbinaries: FRC
- bin/locate.sh initdb postgres
+ bin/locate.sh initdb postgres pg_ctl
# Compile and link the programs:
#
diff --git a/test/bin/locate.sh b/test/bin/locate.sh
index dad0bd49f..19c3a5fda 100755
--- a/test/bin/locate.sh
+++ b/test/bin/locate.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-[ -e bin.sys ] || mkdir bin.sys
+[ -d bin.sys ] || mkdir bin.sys
cd bin.sys
while read d
@@ -13,6 +13,7 @@ do
ln -s $d/$1 .
shift
done
+ exit 0
fi
done <<-HERE
/bin
diff --git a/test/confs/4600 b/test/confs/4600
index ba2135943..d93b683d9 100644
--- a/test/confs/4600
+++ b/test/confs/4600
@@ -1,7 +1,5 @@
# Exim test configuration 4600
-SERVER=
-
.include DIR/aux-var/std_conf_prefix
primary_hostname = myhost.test.ex
@@ -10,10 +8,6 @@ primary_hostname = myhost.test.ex
acl_smtp_rcpt = check_rcpt
-queue_only
-queue_run_in_order
-
-
begin acl
check_rcpt: