From 316aa4b43b8ced4169f3887603d588028c9411a2 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 3 Mar 2014 18:44:29 +0100 Subject: [PATCH] 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. --- .travis.yml | 3 +++ scripts/test.sh | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index affab27fb..e7b0f7e51 100644 --- 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 30e851e31..80d04d1d5 100755 --- 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