summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-09-07 12:42:30 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-02-15 14:18:34 +0100
commitbb5017704ad6f43c2450945ae9d7d15227eef0a9 (patch)
treeada94233a997edd692f2c0a27ed599cccebd9350
parentccd1ec7aa8a0c0da9106c9a39e0d7de531d04dfb (diff)
downloadcurl-bb5017704ad6f43c2450945ae9d7d15227eef0a9.tar.gz
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
-rw-r--r--.travis-iconv-env.sh1
-rw-r--r--.travis.yml12
2 files changed, 13 insertions, 0 deletions
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
@@ -172,6 +176,14 @@ script:
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
mkdir build
cd build