Testsuite: Use more force to find postgresql binaries

diff --git a/test/Makefile.in b/test/Makefile.in
index dbf6d809c3519ab079b4bd7a5c242d370a6b84ca..c96fb4bddbac1407466bc1ee49a31a3b38cccba3 100644 (file)
--- 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 df0219e79fbd674ed270f3a94475e77b752799ff..72e8ffc0db8aad71a934dd11e5968bd5109e54b4 100644 (file)
--- a/test/bin/.gitignore
+++ b/test/bin/.gitignore
@@ -1,2 +1 @@
 *
-!locate.sh

diff --git a/test/bin/locate.sh b/test/bin/locate.sh
deleted file mode 100755 (executable)
index 95f0cea..0000000
--- a/test/bin/locate.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-[ -d bin.sys ] || mkdir bin.sys
-cd bin.sys
-
-while [ $# -gt 0 ]
-do
-  while read d
-  do
-    if [ -x $d/$1 ]
-    then
-      rm -f ./$1
-      ln -s $d/$1 .
-      break
-    fi
-  done <<-HERE
-       /bin
-       /usr/bin
-       /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
-HERE
-  shift
-done
-

diff --git a/test/src/locate.sh b/test/src/locate.sh
new file mode 100755 (executable)
index 0000000..87a82b9
--- /dev/null
+++ b/test/src/locate.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+[ -d bin.sys ] || mkdir bin.sys
+cd bin.sys
+
+while [ $# -gt 0 ]
+do
+  while read d
+  do
+    if [ -x $d/$1 ]
+    then
+      rm -f ./$1
+      ln -s $d/$1 .
+      break
+    fi
+  done <<-HERE
+       /bin
+       /usr/bin
+       /usr/sbin
+       /usr/libexec
+       /usr/local/bin
+        `find /usr/lib/postgresql -name bin -type d`
+HERE
+  shift
+done
+