From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Wed, 17 Jan 2018 23:43:40 +0000 (+0100)
Subject: Testsuite: Use more force to find postgresql binaries
X-Git-Tag: exim-4_91_RC1~97
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=cc285a9fa6dadcffc03350b18c05ce9ee95360d5

Testsuite: Use more force to find postgresql binaries
---

diff --git a/test/Makefile.in b/test/Makefile.in
index dbf6d809c..c96fb4bdd 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -18,7 +18,7 @@ SRC = @srcdir@/src
 
 BINARIES =	bin/cf bin/client $(CLIENT_SSL) $(CLIENT_GNUTLS) \
                 bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \
-                bin/mtpscript bin/server bin/showids
+                bin/mtpscript bin/server bin/showids bin/locate
 
 # List of targets
 
@@ -26,8 +26,8 @@ all:            binaries sysbinaries
 
 binaries:	$(BINARIES)
 
-sysbinaries:	FRC
-		bin/locate.sh initdb postgres pg_ctl mysqld
+sysbinaries:	FORCE
+		sh -x bin/locate initdb postgres pg_ctl mysqld
 		ls -la bin.sys
 
 # Compile and link the programs:
@@ -81,8 +81,11 @@ bin/server:     $(SRC)/server.c Makefile
 bin/showids:    $(SRC)/showids.c Makefile
 		$(CC) $(CFLAGS) $(LDFLAGS) -o bin/showids $(SRC)/showids.c
 
+bin/locate:     $(SRC)/locate.sh Makefile
+		install -m 0755 $(SRC)/locate.sh bin/locate
+
 clean:;         rm -rf $(BINARIES) bin.sys
 
-FRC:
+FORCE:
 
 # End
diff --git a/test/bin/.gitignore b/test/bin/.gitignore
index df0219e79..72e8ffc0d 100644
--- a/test/bin/.gitignore
+++ b/test/bin/.gitignore
@@ -1,2 +1 @@
 *
-!locate.sh
diff --git a/test/bin/locate.sh b/test/src/locate.sh
similarity index 57%
rename from test/bin/locate.sh
rename to test/src/locate.sh
index 95f0cea7b..87a82b911 100755
--- a/test/bin/locate.sh
+++ b/test/src/locate.sh
@@ -19,13 +19,7 @@ do
 	/usr/sbin
 	/usr/libexec
 	/usr/local/bin
-	/usr/lib/postgresql/10/bin
-	/usr/lib/postgresql/9.5/bin
-	/usr/lib/postgresql/9.4/bin
-	/usr/lib/postgresql/9.3/bin
-	/usr/lib/postgresql/9.2/bin
-	/usr/lib/postgresql/9.1/bin
-	/usr/lib/postgresql/9/bin
+        `find /usr/lib/postgresql -name bin -type d`
 HERE
   shift
 done