commit cb38bb80174ac77ddc8bfc28131cb91503d543fa
author Roger Leigh <rleigh@apache.org> Tue Jan 30 20:04:45 2018 +0000
committer Roger Leigh <rleigh@apache.org> Tue Jan 30 20:04:45 2018 +0000
tree 20ab4d460b944797906331d8cfb62b8015cedc62
parent 424cf98d1ec60ea8fb9e3c9d0139aab23650bc6c

travis: Test XMLCh variants

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@1822693 13f79535-47bb-0310-9956-ffa450edef68

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index fd90fa9..f2bbd48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,29 +31,29 @@
 
 env:
   matrix:
-    - BUILD=autoconf TYPE=Release NETWORK=ON NETACCESSOR=curl MSGLOADER=inmemory TRANSCODER=iconv
-    - BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON NETACCESSOR=curl MSGLOADER=icu TRANSCODER=iconv
-    - BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket MSGLOADER=inmemory TRANSCODER=icu
-    - BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv
+    - BUILD=autoconf TYPE=Release NETWORK=ON NETACCESSOR=curl MSGLOADER=inmemory TRANSCODER=iconv XMLCH=char16_t
+    - BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON NETACCESSOR=curl MSGLOADER=icu TRANSCODER=iconv XMLCH=uint16_t
+    - BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket MSGLOADER=inmemory TRANSCODER=icu XMLCH=char16_t
+    - BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv XMLCH=uint16_t
     - BUILD=cmake TOOL="Unix Makefiles" TYPE=Release NETWORK=ON
     - BUILD=cmake TOOL="Ninja" TYPE=Debug
-    - BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl TRANSCODER=macosunicodeconverter
+    - BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl TRANSCODER=macosunicodeconverter XMLCH=uint16_t
 
 matrix:
   fast_finish: true
   exclude:
     - os: linux
-      env: BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl TRANSCODER=macosunicodeconverter
+      env: BUILD=cmake TOOL="Ninja" TYPE=Debug NETACCESSOR=cfurl TRANSCODER=macosunicodeconverter XMLCH=uint16_t
     - os: osx
-      env: BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON NETACCESSOR=curl MSGLOADER=icu TRANSCODER=iconv
+      env: BUILD=cmake TOOL="Unix Makefiles" TYPE=Debug NETWORK=ON NETACCESSOR=curl MSGLOADER=icu TRANSCODER=iconv XMLCH=uint16_t
     - os: osx
-      env: BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket MSGLOADER=inmemory TRANSCODER=icu
+      env: BUILD=cmake TOOL="Ninja" TYPE=Release NETWORK=ON NETACCESSOR=socket MSGLOADER=inmemory TRANSCODER=icu XMLCH=char16_t
     - os: osx
-      env: BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv
+      env: BUILD=autoconf TYPE=Debug NETWORK=ON MSGLOADER=iconv XMLCH=uint16_t
     - os: osx
       env: BUILD=cmake TOOL="Unix Makefiles" TYPE=Release NETWORK=ON
     - os: osx
       env: BUILD=cmake TOOL="Ninja" TYPE=Debug
 
 script:
-  - ./scripts/ci-travis "$BUILD" "$TOOL" "$TYPE" "$NETWORK" "$NETACCESSOR" "$MSGLOADER" "$TRANSCODER"
+  - ./scripts/ci-travis "$BUILD" "$TOOL" "$TYPE" "$NETWORK" "$NETACCESSOR" "$MSGLOADER" "$TRANSCODER" "$XMLCH"

scripts/ci-travis

diff --git a/scripts/ci-travis b/scripts/ci-travis
index 116a146..14d86f0 100755
--- a/scripts/ci-travis
+++ b/scripts/ci-travis
@@ -40,6 +40,12 @@
         windows) opts="$opts --enable-transcoder-windows" ;;
     esac
 
+    # msgloader
+    case "$7" in
+        char16_t) opts="$opts --enable-xmlch-char16_t" ;;
+        uint16_t) opts="$opts --enable-xmlch-uint16_t" ;;
+    esac
+
     autoreconf -ivf
 
     mkdir autoconf-build
@@ -118,6 +124,9 @@
     if [ -n "$6" ]; then
         opts="$opts -Dtranscoder=$6"
     fi
+    if [ -n "$7" ]; then
+        opts="$opts -Dxmlch-type=$7"
+    fi
 
     PATH="$(pwd)/tools/bin:$PATH"
     if [ "$(uname -s)" = "Darwin" ]; then