travis: Add tests for builtin printf hook implementation

We can't test Vstr as it does not properly handle negative int arguments
for custom format callbacks, so some of the enum tests would fail.

diff --git a/.travis.yml b/.travis.yml
index affab27fbdc1f65cd8dada4b4cad1ff8a9df5fd2..e7b0f7e5144430b4725d176463f856a8eeedc461 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,9 @@ env:
     - TEST=openssl LEAK_DETECTIVE=yes
     # libgcrypt can't be deinitialized so we can't test it with leak detective
     - TEST=gcrypt
+    # we can't test Vstr as negative int args are not properly passed to CBs
+    - TEST=printf-builtin
+    - TEST=printf-builtin LEAK_DETECTIVE=yes
     - TEST=all
     - TEST=all MONOLITHIC=yes
 

diff --git a/scripts/test.sh b/scripts/test.sh
index 30e851e3198718a694f64332c287650f711d19b4..80d04d1d53b2c3cde6a0c2b143545b29bc884f9b 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -13,6 +13,8 @@ DEPS="libgmp-dev"
 
 case "$TEST" in
 default)
+       # should be the default, but lets make sure
+       CONFIG="--with-printf-hooks=glibc"
        ;;
 openssl)
        CONFIG="--disable-defaults --enable-tools --enable-openssl"
@@ -22,6 +24,9 @@ gcrypt)
        CONFIG="--disable-defaults --enable-tools --enable-gcrypt --enable-pkcs1"
        DEPS="libgcrypt11-dev"
        ;;
+printf-builtin)
+       CONFIG="--with-printf-hooks=builtin"
+       ;;
 all)
        CONFIG="--enable-all --disable-android-dns --disable-android-log
                        --disable-dumm --disable-kernel-pfroute --disable-keychain
@@ -29,8 +34,6 @@ all)
                        --disable-osx-attr --disable-tkm --disable-uci"
        # not enabled on the build server
        CONFIG="$CONFIG --disable-af-alg"
-       # TODO: add tests for different printf implementations?
-       CONFIG="$CONFIG --disable-vstr"
        # TODO: enable? perhaps via coveralls.io (cpp-coveralls)?
        CONFIG="$CONFIG --disable-coverage"
        DEPS="$DEPS libcurl4-gnutls-dev libsoup2.4-dev libunbound-dev libldns-dev