More fixes for remaining tests..

src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test

@@ -14,7 +14,7 @@ qwerlkjhasdfpuiqwyerm.1234kjhrqwersv.com
 -A _acme-challenge.getdnsapi.net
 EOT
 (
-	if !  "${BUILDDIR}/build-stub-only/libtool" exec valgrind -v --log-file=valgrind.log --leak-check=full --error-exitcode=1 --track-origins=yes "${GETDNS_STUB_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain
+	if ! valgrind -v --log-file=valgrind.log --leak-check=full --error-exitcode=1 --track-origins=yes "${GETDNS_STUB_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain
 	then
 		exit 1
 	fi

src/test/tpkg/275-server-capabilities.tpkg/275-server-capabilities.clean.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 make clean || true
-rm -fr .libs Makefile *_out valgrind.log
+rm -fr CMakeCache.txt *_out valgrind.log

src/test/tpkg/280-limit_outstanding_queries.tpkg/280-limit_outstanding_queries.pre

@@ -7,8 +7,8 @@
 (
 	BUILDDIR4SED=`echo "${BUILDDIR}/build-stub-only" | sed  's/\//\\\\\//g'`
 	sed -e "s/@BUILDDIR@/${BUILDDIR4SED}/g" \
-	    -e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.Makefile"
+	    -e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.cmake"
-) > Makefile
+) > CMakeLists.txt
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   sed -i '' -e "s/libgetdns.so/libgetdns.dylib/g" CMakeLists.txt 

src/test/tpkg/285-out_of_filedescriptors.tpkg/285-out_of_filedescriptors.pre

@@ -5,10 +5,11 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
 (
-	grep '^CC=' "${BUILDDIR}/build-stub-only/src/Makefile"
-	grep '^LDFLAGS=' "${BUILDDIR}/build-stub-only/src/Makefile"
-
 	BUILDDIR4SED=`echo "${BUILDDIR}/build-stub-only" | sed  's/\//\\\\\//g'`
 	sed -e "s/@BUILDDIR@/${BUILDDIR4SED}/g" \
-	    -e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.Makefile"
+	    -e "s/@TPKG_NAME@/${TPKG_NAME}/g" "${TPKG_NAME}.cmake"
-) > Makefile
+) > CMakeLists.txt
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  sed -i '' -e "s/libgetdns.so/libgetdns.dylib/g" CMakeLists.txt 
+fi

src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.dsc

@@ -9,7 +9,7 @@ CmdDepends: scan-build
 Depends:
 Help:
 Pre: 400-static-analysis.pre
-Post: 400-static-analysis.post
+Post: 
 Test: 400-static-analysis.test
 AuxFiles: 
 Passed:

src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.post

@@ -12,9 +12,3 @@ else
 fi
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
-
-for f in `cat restore-srcdir-configure-settings`
-do
-	mv "${SRCROOT}/${f}.build-static-analysis" "${SRCROOT}/${f}"
-done
-

src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.pre

@@ -13,23 +13,13 @@ fi
 # use .tpkg.var.test for in test variable passing
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
-echo "" > restore-srcdir-configure-settings
-for f in `grep 'CONFIG_[FH][IE][LA][ED][SE]' "${SRCROOT}/configure.ac" | sed -e 's/^.*(\[//g' -e 's/\])//g'`
-do
-	if [ -f "${SRCROOT}/$f" ]
-	then
-		mv "${SRCROOT}/${f}" "${SRCROOT}/${f}.build-static-analysis" && \
-			echo "$f" >> restore-srcdir-configure-settings
-	fi
-done
 rm -fr "${BUILDDIR}/build-static-analysis"
 mkdir  "${BUILDDIR}/build-static-analysis"
 cd "${BUILDDIR}/build-static-analysis"
-"${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" --enable-all-drafts --with-stubby --with-libevent --with-libev --with-libuv \
+(rm CMakeCache.txt & cmake -DENABLE_DRAFT_MDNS_SUPPORT=ON -DBUILD_STUBBY=ON -DCMAKE_INSTALL_PREFIX=../install -DUSE_LIBEVENT2=ON -DUSE_LIBEV=ON -DUSE_LIBUV=ON  $* ${SRCROOT}) || \
-    || "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" --enable-all-drafts --with-stubby --with-libevent --with-libev \
+(rm CMakeCache.txt & cmake -DENABLE_DRAFT_MDNS_SUPPORT=ON -DBUILD_STUBBY=ON -DCMAKE_INSTALL_PREFIX=../install -DUSE_LIBEVENT2=ON -DUSE_LIBEV=ON                 $* ${SRCROOT}) || \
-    || "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" --enable-all-drafts --with-stubby --with-libevent --with-libuv \
+(rm CMakeCache.txt & cmake -DENABLE_DRAFT_MDNS_SUPPORT=ON -DBUILD_STUBBY=ON -DCMAKE_INSTALL_PREFIX=../install -DUSE_LIBEVENT2=ON                 -DUSE_LIBUV=ON $* ${SRCROOT}) || \
-    || "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" --enable-all-drafts --with-stubby --with-libev --with-libuv \
+(rm CMakeCache.txt & cmake -DENABLE_DRAFT_MDNS_SUPPORT=ON -DBUILD_STUBBY=ON -DCMAKE_INSTALL_PREFIX=../install                    -DUSE_LIBEV=ON  -DUSE_LIBUV=ON $* ${SRCROOT}) || \
-    || "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" --enable-all-drafts --with-stubby --with-libevent \
+(rm CMakeCache.txt & cmake -DENABLE_DRAFT_MDNS_SUPPORT=ON -DBUILD_STUBBY=ON -DCMAKE_INSTALL_PREFIX=../install -DUSE_LIBEVENT2=ON                                $* ${SRCROOT}) || \
-    || "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" --enable-all-drafts --with-stubby --with-libev \
+(rm CMakeCache.txt & cmake -DENABLE_DRAFT_MDNS_SUPPORT=ON -DBUILD_STUBBY=ON -DCMAKE_INSTALL_PREFIX=../install                    -DUSE_LIBEV=ON                 $* ${SRCROOT}) || \
-    || "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" --enable-all-drafts --with-stubby --with-libuv
+(rm CMakeCache.txt & cmake -DENABLE_DRAFT_MDNS_SUPPORT=ON -DBUILD_STUBBY=ON -DCMAKE_INSTALL_PREFIX=../install                                    -DUSE_LIBUV=ON $* ${SRCROOT})
-