Make sure all platform specific before_install scripts call the global before_install script. Python version setup moved to global before_install script.

6 files changed, 17 insertions, 13 deletions

diff --git a/.travis.yml b/.travis.yml
index 4a0a2a98..31ab75d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ matrix:
       env:
         - BUILD_NAME=linux_gcc
         - DETAILS="linux, gcc"
-        - PY_VERSION=3.4
     - os: linux
       compiler: clang
       language: c
@@ -27,13 +26,11 @@ matrix:
       env:
         - BUILD_NAME=linux_clang
         - DETAILS="linux, clang"
-        - PY_VERSION=3.4
     - os: osx
       language: c
       env:
         - BUILD_NAME=osx
         - DETAILS="osx"
-        - PY_VERSION=3.4
     - os: linux
       compiler: gcc
       language: c
@@ -41,7 +38,6 @@ matrix:
       env:
         - BUILD_NAME=mingw32
         - DETAILS="mingw32"
-        - PY_VERSION=3.4
 
 #  allow_failures:
 #    - os: osx
diff --git a/travis/before_install.sh b/travis/before_install.sh
index e70a4f3e..12f2edba 100755
--- a/travis/before_install.sh
+++ b/travis/before_install.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-# Specify python version. This introduced because the
-# Travis setup seems to vary between platforms.
-pyenv global system $PY_VERSION
-pyenv versions # a bit of debug info
-
-pip install --user cpp-coveralls
-./travis/docker.sh
-
+# All platform-specific before_install scripts starts by running this
+# "global" before_install script.
 
+# Specify which version of python to use. The default python to use on Travis
+# can vary from platform to platform, so we use pyenv to make sure we use
+# a version that works for the complete build processs.
+pyenv global system 3.4
+pyenv versions # a bit of debug info
diff --git a/travis/linux_clang/before_install.sh b/travis/linux_clang/before_install.sh
index 75acd97a..f6e21076 100755
--- a/travis/linux_clang/before_install.sh
+++ b/travis/linux_clang/before_install.sh
@@ -2,4 +2,5 @@
 
 set -e
 
+./travis/before_install.sh
 # do nothing
diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh
index 31805e80..0c37643c 100755
--- a/travis/linux_gcc/before_install.sh
+++ b/travis/linux_gcc/before_install.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+./travis/before_install.sh
+
 sudo apt-get install -y cppcheck
 
 cppcheck --inline-suppr --template='{file}:{line},{severity},{id},{message}' --enable=all --inconclusive --std=posix -DPJ_SELFTEST=1 src/*.c 2>/tmp/cppcheck.txt
@@ -12,4 +14,6 @@ fi
 
 set -e
 
-./travis/before_install.sh
+pip install --user cpp-coveralls
+./travis/docker.sh
+
diff --git a/travis/mingw32/before_install.sh b/travis/mingw32/before_install.sh
index 18949b75..5cadb761 100755
--- a/travis/mingw32/before_install.sh
+++ b/travis/mingw32/before_install.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+./travis/before_install.sh
+
 sudo apt-get update -qq
 sudo apt-get install -qq wine
 sudo apt-get install -qq mingw32
diff --git a/travis/osx/before_install.sh b/travis/osx/before_install.sh
index cd553dda..4ca62084 100755
--- a/travis/osx/before_install.sh
+++ b/travis/osx/before_install.sh
@@ -2,5 +2,7 @@
 
 set -e
 
+./travis/before_install.sh
+
 brew install ccache
 brew install python3