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 d6e2847589c876d71e1205c11bfe9a2ce7c22a23..e58c468866f5a18abd1b1b924bcb31fdb42af35a 100644 (file)
--- 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 990aa54cc14b726cc781ca7b9465ec72439765af..37722bd37298f482aa27b0894e131980ec42693c 100644 (file)
--- 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 1bd703376c214971c94d845f46d88c21d0419b18..0a84fbab23d798b507dbc341a14e3c1a5929c3b3 100644 (file)
--- 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 3781a0bf9985f9005fd1035c50f0e40d20358928..3600619f9d7b4c5cbb77c0eb6a6f7efb0d44947c 100644 (file)
--- 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 180f9de39904721c2eb85145681a8a2ce189ff37..030207c4fcbf5cd3b9a9cc07c572b630711bf0eb 100644 (file)
--- 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 96c2ddab673f61a0e03a951e973a725c47ea2c21..68dc6881afb0e3ef4f17a5effd5f3e27fa642a6e 100644 (file)
--- 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 20aba1e77fe896f507612109c4ff1e37773000de..563cd23f3ffb723e5d98323e51d39986fd27eb87 100755 (executable)
--- 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.