Testsuite: ignore more SSL library output variances

[exim.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index c96fb4bddbac1407466bc1ee49a31a3b38cccba3..26631f39852b531239847dd2db959b5002b3030f 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -8,6 +8,7 @@ CFLAGS=@CFLAGS@ @BIND_8_COMPAT@ @DEFS@
 LDFLAGS=@LDFLAGS@
 CLIENT_SSL=@CLIENT_SSL@
 CLIENT_GNUTLS=@CLIENT_GNUTLS@
+B64_GNUTLS=@B64_GNUTLS@
 LOADED=@LOADED@
 LOADED_OPT=@LOADED_OPT@
 LIBS=@LIBS@
@@ -18,7 +19,8 @@ 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/locate
+                bin/mtpscript bin/server bin/showids bin/locate \
+               $(B64_GNUTLS)
 
 # List of targets
 
@@ -26,8 +28,8 @@ all:            binaries sysbinaries
 
 binaries:      $(BINARIES)
 
-sysbinaries:   FORCE
-               sh -x bin/locate initdb postgres pg_ctl mysqld
+sysbinaries:   FORCE binaries
+               bin/locate initdb postgres pg_ctl mysqld
                ls -la bin.sys
 
 # Compile and link the programs:
@@ -82,7 +84,12 @@ 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
+               cp $(SRC)/locate.pl bin/locate
+               chmod 0755 bin/locate
+
+bin/ed25519_privkey_pem_to_pubkey_raw_b64:     $(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c Makefile
+               $(CC) $(CFLAGS) -DHAVE_GNUTLS $(LDFLAGS) -o bin/ed25519_privkey_pem_to_pubkey_raw_b64 \
+                       $(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c  -lgnutls -lgcrypt $(LIBS)
 
 clean:;         rm -rf $(BINARIES) bin.sys