diff --git a/src/Makefile.in b/src/Makefile.in index aa5e7fa7..c14afbbb 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -48,7 +48,7 @@ srcdir = @srcdir@ LIBTOOL = ../libtool CC=@CC@ -CFLAGS=-I$(srcdir) -I. @CFLAGS@ @CPPFLAGS@ +CFLAGS=-I$(srcdir) -I. @CFLAGS@ @CPPFLAGS@ $(XTRA_CFLAGS) LDFLAGS=@LDFLAGS@ @LIBS@ EXTENSION_LIBEVENT_LIB=@EXTENSION_LIBEVENT_LIB@ diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.pre b/src/test/tpkg/100-compile.tpkg/100-compile.pre index f0bd9a5c..6b76edba 100644 --- a/src/test/tpkg/100-compile.tpkg/100-compile.pre +++ b/src/test/tpkg/100-compile.tpkg/100-compile.pre @@ -25,14 +25,4 @@ done rm -fr "${BUILDDIR}/build" mkdir "${BUILDDIR}/build" cd "${BUILDDIR}/build" -if [ -z "$CFLAGS" ] -then - if (echo $*|grep -q CFLAGS) - then - "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" - else - "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --prefix "${BUILDDIR}/install" - fi -else - "${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" -fi +"${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install" diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.test b/src/test/tpkg/100-compile.tpkg/100-compile.test index e527192b..a5539d13 100644 --- a/src/test/tpkg/100-compile.tpkg/100-compile.test +++ b/src/test/tpkg/100-compile.tpkg/100-compile.test @@ -5,4 +5,4 @@ [ -f .tpkg.var.test ] && source .tpkg.var.test cd "${BUILDDIR}/build" -make +make XTRA_CFLAGS='-Wpedantic -Werror' diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre index 1aa7252f..46686828 100644 --- a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre +++ b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre @@ -25,14 +25,4 @@ done rm -fr "${BUILDDIR}/build-stub-only" mkdir "${BUILDDIR}/build-stub-only" cd "${BUILDDIR}/build-stub-only" -if [ -z "$CFLAGS" ] -then - if (echo $*|grep -q CFLAGS) - then - "${SRCROOT}/configure" $* --enable-stub-only - else - "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-stub-only - fi -else - "${SRCROOT}/configure" $* --enable-stub-only -fi +"${SRCROOT}/configure" $* --enable-stub-only diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.test b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.test index 369379c4..421d5483 100644 --- a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.test +++ b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.test @@ -5,4 +5,4 @@ [ -f .tpkg.var.test ] && source .tpkg.var.test cd "${BUILDDIR}/build-stub-only" -make +make XTRA_CFLAGS='-Wpedantic -Werror' diff --git a/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test b/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test index 5242e211..5da09cd9 100644 --- a/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test +++ b/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test @@ -7,32 +7,10 @@ rm -fr "${BUILDDIR}/build-event-loops" mkdir "${BUILDDIR}/build-event-loops" cd "${BUILDDIR}/build-event-loops" -if [ -z "$CFLAGS" ] -then - if (echo $*|grep -q CFLAGS) - then - "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libuv - else - "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev --with-libuv \ - || "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev \ - || "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libuv \ - || "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-all-drafts --with-getdns_query --with-libev --with-libuv \ - || "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-all-drafts --with-getdns_query --with-libevent \ - || "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-all-drafts --with-getdns_query --with-libev \ - || "${SRCROOT}/configure" CFLAGS="-Wpedantic -Werror" $* --enable-all-drafts --with-getdns_query --with-libuv - fi -else - "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev \ - || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libuv -fi +"${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev --with-libuv \ + || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev \ + || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libuv \ + || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev --with-libuv \ + || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent \ + || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev \ + || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libuv diff --git a/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.dsc b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.dsc new file mode 100644 index 00000000..82cbdb8c --- /dev/null +++ b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.dsc @@ -0,0 +1,16 @@ +BaseName: 315-event-loops-compile +Version: 1.0 +Description: Compile +CreationDate: do 8 dec 2016 23:38:18 CET +Maintainer: Willem Toorop +Category: +Component: +CmdDepends: +Depends: 300-event-loops-configure.tpkg +Help: +Pre: 315-event-loops-compile.pre +Post: 315-event-loops-compile.post +Test: 315-event-loops-compile.test +AuxFiles: +Passed: +Failure: diff --git a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.post b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.post similarity index 92% rename from src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.post rename to src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.post index d8029117..4d5f4293 100644 --- a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.post +++ b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.post @@ -1,4 +1,4 @@ -# #-- 326-event-loops-compile.post --# +# #-- 315-event-loops-compile.post --# # source the master var file when it's there if [ -f ../.tpkg.var.master ] then diff --git a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.pre b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.pre similarity index 94% rename from src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.pre rename to src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.pre index a4ef762d..4ec46299 100644 --- a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.pre +++ b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.pre @@ -1,4 +1,4 @@ -# #-- 326-event-loops-compile.pre--# +# #-- 315-event-loops-compile.pre--# # source the master var file when it's there if [ -f ../.tpkg.var.master ] then diff --git a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.test b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.test similarity index 75% rename from src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.test rename to src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.test index 217cfd35..227bb1fc 100644 --- a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.test +++ b/src/test/tpkg/315-event-loops-compile.tpkg/315-event-loops-compile.test @@ -1,8 +1,8 @@ -# #-- 326-event-loops-compile.test --# +# #-- 315-event-loops-compile.test --# # source the master var file when it's there [ -f ../.tpkg.var.master ] && source ../.tpkg.var.master # use .tpkg.var.test for in test variable passing [ -f .tpkg.var.test ] && source .tpkg.var.test cd "${BUILDDIR}/build-event-loops" -make +make XTRA_CFLAGS='-Wpedantic -Werror' diff --git a/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.test b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.test index 055f8f9b..aa19d023 100644 --- a/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.test +++ b/src/test/tpkg/320-event-loops-compile.tpkg/320-event-loops-compile.test @@ -5,4 +5,5 @@ [ -f .tpkg.var.test ] && source .tpkg.var.test cd "${BUILDDIR}/build-event-loops" +make clean make diff --git a/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.dsc b/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.dsc deleted file mode 100644 index 3d1dec87..00000000 --- a/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.dsc +++ /dev/null @@ -1,16 +0,0 @@ -BaseName: 323-event-loops-configure -Version: 1.0 -Description: Configure for maximum coverage -CreationDate: do 8 dec 2016 16:21:08 CET -Maintainer: Willem Toorop -Category: -Component: -CmdDepends: -Depends: -Help: -Pre: 323-event-loops-configure.pre -Post: -Test: 323-event-loops-configure.test -AuxFiles: -Passed: -Failure: diff --git a/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.pre b/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.pre deleted file mode 100644 index a8423666..00000000 --- a/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.pre +++ /dev/null @@ -1,14 +0,0 @@ -# #-- 323-event-loops-configure.pre--# -# source the master var file when it's there -if [ -f ../.tpkg.var.master ] -then - source ../.tpkg.var.master -else - ( - cd .. - [ -f "${TPKG_SRCDIR}/setup-env.sh" ] \ - && sh "${TPKG_SRCDIR}/setup-env.sh" - ) && source ../.tpkg.var.master -fi -# use .tpkg.var.test for in test variable passing -[ -f .tpkg.var.test ] && source .tpkg.var.test diff --git a/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.test b/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.test deleted file mode 100644 index b54bd321..00000000 --- a/src/test/tpkg/323-event-loops-configure.tpkg/323-event-loops-configure.test +++ /dev/null @@ -1,16 +0,0 @@ -# #-- 323-event-loops-configure.test --# -# source the master var file when it's there -[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master -# use .tpkg.var.test for in test variable passing -[ -f .tpkg.var.test ] && source .tpkg.var.test - -rm -fr "${BUILDDIR}/build-event-loops" -mkdir "${BUILDDIR}/build-event-loops" -cd "${BUILDDIR}/build-event-loops" -"${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libev --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libev \ - || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libev --with-libuv \ - || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent \ - || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libev \ - || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libuv diff --git a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.dsc b/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.dsc deleted file mode 100644 index c4760a36..00000000 --- a/src/test/tpkg/326-event-loops-compile.tpkg/326-event-loops-compile.dsc +++ /dev/null @@ -1,16 +0,0 @@ -BaseName: 326-event-loops-compile -Version: 1.0 -Description: Compile -CreationDate: do 8 dec 2016 16:21:21 CET -Maintainer: Willem Toorop -Category: -Component: -CmdDepends: -Depends: 300-event-loops-configure.tpkg -Help: -Pre: 326-event-loops-compile.pre -Post: 326-event-loops-compile.post -Test: 326-event-loops-compile.test -AuxFiles: -Passed: -Failure: