From 91d7f1e18fa5f2a5faccbb60381410577bad808a Mon Sep 17 00:00:00 2001
From: Andrew Walker <a.walker@leeds.ac.uk>
Date: Thu, 5 Apr 2018 20:55:41 +0100
Subject: [PATCH 1/3] Travis with compiler option in matrix

Just try it with gfortran to start with
---
 .travis.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d94bf262..369e95ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,23 +22,25 @@ env:
       # Using configure and make, run the tests.
     - >
       BUILD_SCRIPT="FC='gfortran -fno-backtrace' ./configure &&
-      make -j 2 && make -j 2 check && ./testcheck.sh"
+      make -j 2 && make -j 2 check && ./testcheck.sh" COMPILER="gfortran"
 
       # Using cmake - just build, tests not working yet.
     - >
       BUILD_SCRIPT="mkdir cmake_build/ && cd cmake_build &&
-      cmake ../ && make -j 2"
+      cmake ../ && make -j 2" COMPILER="gfortran"
 
 install:
   - |
-    if [[ ! -d "$HOME/.local/bin" ]]; then
-      mkdir -p "$HOME/.local/bin"
+    if [[ "$COMPILER" == 'gfortran' ]]; then
+      if [[ ! -d "$HOME/.local/bin" ]]; then
+        mkdir -p "$HOME/.local/bin"
+      fi
+      export PATH="$HOME/.local/bin:$PATH"
+      ls -l /usr/bin/gfortran-4.9
+      export FC=/usr/bin/gfortran-4.9
+      ln -fs /usr/bin/gfortran-4.9 "$HOME/.local/bin/gfortran" 
+      gfortran --version
     fi
-  - export PATH="$HOME/.local/bin:$PATH"
-  - ls -l /usr/bin/gfortran-4.9
-  - export FC=/usr/bin/gfortran-4.9
-  - ln -fs /usr/bin/gfortran-4.9 "$HOME/.local/bin/gfortran" 
-  - gfortran --version
 
 script:
   - echo $BUILD_SCRIPT

From 3b54c2c2cb4c304ea2222a9b10635fc38a25a31d Mon Sep 17 00:00:00 2001
From: Andrew Walker <a.walker@leeds.ac.uk>
Date: Thu, 5 Apr 2018 21:09:27 +0100
Subject: [PATCH 2/3] Add intel to travis matrix

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 369e95ac..0e6bdb8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,12 @@ env:
       BUILD_SCRIPT="mkdir cmake_build/ && cd cmake_build &&
       cmake ../ && make -j 2" COMPILER="gfortran"
 
+      # Using configure and make and intel run the tests.
+    - >
+      BUILD_SCRIPT="FC='ifort -notraceback' ./configure &&
+      make -j 2 && make -j 2 check && ./testcheck.sh" COMPILER="ifort"
+
+
 install:
   - |
     if [[ "$COMPILER" == 'gfortran' ]]; then
@@ -40,8 +46,16 @@ install:
       export FC=/usr/bin/gfortran-4.9
       ln -fs /usr/bin/gfortran-4.9 "$HOME/.local/bin/gfortran" 
       gfortran --version
+    elif [[ "$COMPILER" == 'ifort' ]]; then
+      wget -q 'https://raw.githubusercontent.com/nemequ/icc-travis/master/install-icc.sh' 
+      chmod u+x ./install-icc.sh
+      ./install-icc.sh --components ifort
+      source ~/.bashrc
     fi
 
 script:
   - echo $BUILD_SCRIPT
   - bash <<<$BUILD_SCRIPT
+
+after_script:
+  - '[[ ! -z "${INTEL_INSTALL_PATH}" ]] && uninstall_intel_software'

From 0c54513f9b1f78dc1f5c908fac837b612d51bfc1 Mon Sep 17 00:00:00 2001
From: Andrew Walker <a.walker@leeds.ac.uk>
Date: Sun, 29 Apr 2018 08:48:18 +0100
Subject: [PATCH 3/3] Try PGF90 compiler on Travis

Can we build and run our tests with PGI's
community compiler? Using:
    https://github.com/nemequ/pgi-travis
---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0e6bdb8c..63a2334c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,10 @@ env:
       BUILD_SCRIPT="FC='ifort -notraceback' ./configure &&
       make -j 2 && make -j 2 check && ./testcheck.sh" COMPILER="ifort"
 
+      # Using configure and make and pgi run the tests.
+    - >
+      BUILD_SCRIPT="FC='pgf90' ./configure &&
+      make -j 2 && make -j 2 check && ./testcheck.sh" COMPILER="pgi"
 
 install:
   - |
@@ -51,6 +55,11 @@ install:
       chmod u+x ./install-icc.sh
       ./install-icc.sh --components ifort
       source ~/.bashrc
+    elif [[ "$COMPILER" == 'pgi' ]]; then
+      wget -q 'https://raw.githubusercontent.com/nemequ/pgi-travis/master/install-pgi.sh' 
+      chmod u+x ./install-pgi.sh
+      ./install-pgi.sh 
+      source ~/.bashrc
     fi
 
 script: