From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 17 Jul 2019 17:34:11 +0000 (+0200)
Subject: Make tpkg tests work on MacOS
X-Git-Tag: release-1.7.1-rc1~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43455273675c279948d50844d2a1d0bdb845e0ce;p=thirdparty%2Fldns.git

Make tpkg tests work on MacOS
---

diff --git a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
index d6e28475..e58c4688 100644
--- a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
+++ b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
@@ -11,9 +11,9 @@ mandir = @mandir@
 
 CC = @CC@
 CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
+LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
+LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
 
 # Hmmm gcc 4.6.1 expects $(LIBS) as the last argument
 
diff --git a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.pre b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.pre
index 990aa54c..37722bd3 100644
--- a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.pre
+++ b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.pre
@@ -31,9 +31,10 @@ fi;
 opts=`../../config.status --config`
 echo options: $opts
 
-$conf 12-unit-tests-dnssec.configure.ac > configure && \
-chmod +x configure && \
-$hdr 12-unit-tests-dnssec.configure.ac &&\
-eval ./configure --with-ldns=../../ "$opts" && \
+#$conf 12-unit-tests-dnssec.configure.ac > configure && \
+#chmod +x configure && \
+#$hdr 12-unit-tests-dnssec.configure.ac &&\
+#eval ./configure --with-ldns=../.. "$opts" && \
+../../config.status --file 12-unit-tests-dnssec.Makefile
 $mk -f 12-unit-tests-dnssec.Makefile
 
diff --git a/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in b/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
index 1bd70337..0a84fbab 100644
--- a/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
+++ b/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
@@ -11,9 +11,9 @@ mandir = @mandir@
 
 CC = @CC@
 CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
+LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
+LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
 
 COMPILE         = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK            = $(CC) $(CFLAGS) $(LDFLAGS)
diff --git a/test/13-unit-tests-base.tpkg/13-unit-tests-base.pre b/test/13-unit-tests-base.tpkg/13-unit-tests-base.pre
index 3781a0bf..3600619f 100644
--- a/test/13-unit-tests-base.tpkg/13-unit-tests-base.pre
+++ b/test/13-unit-tests-base.tpkg/13-unit-tests-base.pre
@@ -31,11 +31,10 @@ if [ ! $mk ] || [ ! $conf ] || [ ! $hdr ] ; then
 	exit 1
 fi;
 
-
-
-$conf 13-unit-tests-base.configure.ac > configure && \
-chmod +x configure && \
-$hdr 13-unit-tests-base.configure.ac &&\
-eval ./configure --with-ldns=../../ "$opts" && \
+#$conf 13-unit-tests-base.configure.ac > configure && \
+#chmod +x configure && \
+#$hdr 13-unit-tests-base.configure.ac &&\
+#eval ./configure --with-ldns=../../ "$opts" && \
+../../config.status --file 13-unit-tests-base.Makefile
 $mk -f 13-unit-tests-base.Makefile
 
diff --git a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
index 180f9de3..030207c4 100644
--- a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
+++ b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
@@ -11,9 +11,9 @@ mandir = @mandir@
 
 CC = @CC@
 CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
+LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
+LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
 
 COMPILE         = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK            = $(CC) $(CFLAGS) $(LDFLAGS)
diff --git a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.pre b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.pre
index 96c2ddab..68dc6881 100644
--- a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.pre
+++ b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.pre
@@ -31,8 +31,9 @@ if [ ! $mk ] || [ ! $conf ] || [ ! $hdr ] ; then
 	exit 1
 fi;
 
-$conf 15-unit-tests-rrtypes.configure.ac > configure && \
-chmod +x configure && \
-$hdr 15-unit-tests-rrtypes.configure.ac &&\
-eval ./configure --with-ldns=../../ "$opts" && \
+#$conf 15-unit-tests-rrtypes.configure.ac > configure && \
+#chmod +x configure && \
+#$hdr 15-unit-tests-rrtypes.configure.ac &&\
+#eval ./configure --with-ldns=../../ "$opts" && \
+../../config.status --file 15-unit-tests-rrtypes.Makefile
 $mk -f 15-unit-tests-rrtypes.Makefile
diff --git a/test/test_ci.sh b/test/test_ci.sh
index 20aba1e7..563cd23f 100755
--- a/test/test_ci.sh
+++ b/test/test_ci.sh
@@ -40,7 +40,7 @@ do
 	esac
 	case $TESTNR in
 	02)	# splint doesn't work on linux
-		[ "x$(uname -o)" = "xGNU/Linux" ] && continue
+		[ "x$(uname -s)" = "xLinux" ] && continue
 		;;
 	32)	# No backwards compatibility regression testing 
 		# when .so had major version bumb.