Testsuite: Use more force to find postgresql binaries
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Wed, 17 Jan 2018 23:43:40 +0000 (00:43 +0100)
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Wed, 17 Jan 2018 23:46:18 +0000 (00:46 +0100)
test/Makefile.in
test/bin/.gitignore
test/src/locate.sh [moved from test/bin/locate.sh with 57% similarity]

index dbf6d80..c96fb4b 100644 (file)
@@ -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
index df0219e..72e8ffc 100644 (file)
@@ -1,2 +1 @@
 *
-!locate.sh
similarity index 57%
rename from test/bin/locate.sh
rename to test/src/locate.sh
index 95f0cea..87a82b9 100755 (executable)
@@ -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