From bb5017704ad6f43c2450945ae9d7d15227eef0a9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 7 Sep 2017 12:42:30 +0200 Subject: travis: add build with iconv enabled ... to verify it builds and works fine. Ref: https://curl.haxx.se/mail/lib-2017-09/0031.html Closes #1872 --- .travis-iconv-env.sh | 1 + .travis.yml | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 .travis-iconv-env.sh diff --git a/.travis-iconv-env.sh b/.travis-iconv-env.sh new file mode 100644 index 000000000..bb7dcf422 --- /dev/null +++ b/.travis-iconv-env.sh @@ -0,0 +1 @@ +export CPPFLAGS="-DCURL_DOES_CONVERSIONS -DHAVE_ICONV -DCURL_ICONV_CODESET_OF_HOST='\"ISO8859-1\"'" diff --git a/.travis.yml b/.travis.yml index d2924556a..abca7bd57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,10 @@ matrix: compiler: clang dist: trusty env: T=debug + - os: linux + compiler: gcc + dist: trusty + env: T=iconv - os: osx compiler: gcc env: T=debug @@ -170,6 +174,14 @@ script: make && make examples make test-nonflaky fi + - | + set -eo pipefail + if [ "$T" = "iconv" ]; then + source .travis-iconv-env.sh + ./configure --enable-debug --enable-werror $C + make && make examples + make TFLAGS=-n test-nonflaky + fi - | set -eo pipefail if [ "$T" = "cmake" ]; then -- cgit v1.2.3