From c2b1df496ab856921316ec29ddfe7d11013594fb Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Mon, 24 Dec 2018 18:59:56 +0000
Subject: [PATCH] Travis CI: Add intel-16 testing.

---
 .travis.yml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 521f2745..45a65b54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,28 @@ matrix:
     - os: linux
       env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
 
+    - os: linux
+      env: TOOLSET=intel COMPILER=icpc CXXSTD=03,11 TEST_INTEL=1
+      before_install:
+        - wget -q  'https://raw.githubusercontent.com/nemequ/icc-travis/master/install-icc.sh'
+        - bash ./install-icc.sh
+      after_script:
+        - '[[ ! -z "${INTEL_INSTALL_PATH}" ]] && uninstall_intel_software'
+
+    - os: linux
+      env: TOOLSET=intel COMPILER=icpc CXXSTD=11,14 TEST_INTEL=1 EXTRA_FLAGS=-gcc-name=g++-6
+      before_install:
+        - wget -q  'https://raw.githubusercontent.com/nemequ/icc-travis/master/install-icc.sh'
+        - bash ./install-icc.sh
+      after_script:
+        - '[[ ! -z "${INTEL_INSTALL_PATH}" ]] && uninstall_intel_software'
+      addons:
+        apt:
+          packages:
+            - g++-6
+          sources:
+            - ubuntu-toolchain-r-test
+
     - os: linux
       compiler: g++-4.4
       env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
@@ -268,8 +290,9 @@ install:
   - ./b2 headers
  
 script:
+  - if [ $TEST_INTEL ]; then source ~/.bashrc; fi
   - |-
-    echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
+    echo "using $TOOLSET : : $COMPILER : <cxxflags>$EXTRA_FLAGS <linkflags>$EXTRA_FLAGS ;" > ~/user-config.jam
   - IFS=','
   - for CXXLOCAL in $CXXSTD; do  (cd libs/config/test && ../../../b2 config_info_travis_install toolset=$TOOLSET cxxstd=$CXXLOCAL $CXXSTD_DIALECT && echo With Standard Version $CXXLOCAL && ./config_info_travis && rm ./config_info_travis)  done
   - unset IFS