From b58c3e0fa108f99a53a3670e8fb920f70ce4a565 Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Wed, 15 Mar 2017 15:49:57 -0700
Subject: Run tests with more versions of libclang

First, update our existing 3.8.X and 3.9.X libclang testing versions to their
latest point releases. Second, add testing on the latest 3.7.X release and the
latest 4.0.X release.
---
 .travis.yml          | 15 +++++++++++++--
 ci/before_install.sh | 12 ++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0d256172..7805b578 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,19 @@ rust:
   - stable
 
 env:
-  - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.8 BINDGEN_FEATURES=testing_only_llvm_stable
-  - CARGO_TARGET_DIR=/tmp/bindgen LLVM_VERSION=3.9 BINDGEN_FEATURES=
+  global:
+    - CARGO_TARGET_DIR=/tmp/bindgen
+  matrix:
+    - LLVM_VERSION=3.7.1 BINDGEN_FEATURES=testing_only_llvm_stable
+    - LLVM_VERSION=3.8.1 BINDGEN_FEATURES=testing_only_llvm_stable
+    - LLVM_VERSION=3.9.0 BINDGEN_FEATURES=
+    - LLVM_VERSION=4.0.0 BINDGEN_FEATURES=
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: LLVM_VERSION=4.0.0 BINDGEN_FEATURES=
+    - env: LLVM_VERSION=3.7.1 BINDGEN_FEATURES=testing_only_llvm_stable
 
 cache:
   directories:
diff --git a/ci/before_install.sh b/ci/before_install.sh
index ebe4f4fb..719c4efe 100644
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -1,4 +1,4 @@
-set -e
+set -ex
 pushd ~
 
 # Workaround for Travis CI macOS bug (https://github.com/travis-ci/travis-ci/issues/6307)
@@ -6,16 +6,8 @@ if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
     rvm get head || true
 fi
 
-function llvm_version_triple() {
-    if [ "$1" == "3.8" ]; then
-        echo "3.8.0"
-    elif [ "$1" == "3.9" ]; then
-        echo "3.9.0"
-    fi
-}
-
 function llvm_download() {
-    export LLVM_VERSION_TRIPLE=`llvm_version_triple ${LLVM_VERSION}`
+    export LLVM_VERSION_TRIPLE="${LLVM_VERSION}"
     export LLVM=clang+llvm-${LLVM_VERSION_TRIPLE}-x86_64-$1
 
     wget http://llvm.org/releases/${LLVM_VERSION_TRIPLE}/${LLVM}.tar.xz
-- 
cgit v1.2.3