From 97c138dbd8ec736073896f4e6b4f586fc16febfd Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 28 Jan 2016 23:09:32 +0000
Subject: [PATCH] Travis: ensure the requested language version is being tested

The various Python versions were not being tested
---
 .travis.yml                   | 2 +-
 Tools/travis-linux-install.sh | 9 ++++++---
 Tools/travis-osx-install.sh   | 4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d79cc419..0951df707 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -188,7 +188,7 @@ install:
   - $CXX --version
 script:
   - echo 'Configuring...' && echo -en 'travis_fold:start:script.1\\r'
-  - if test -n "$SWIGLANG"; then CONFIGOPTS+=(--without-alllang --with-$SWIGLANG$PY3); fi
+  - if test -n "$SWIGLANG"; then CONFIGOPTS+=(--without-alllang --with-$WITHLANG); fi
   - echo "${CONFIGOPTS[@]}"
   - ./autogen.sh && mkdir -p build/build && cd build/build && ../../configure "${CONFIGOPTS[@]}"
   - echo -en 'travis_fold:end:script.1\\r'
diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh
index b23b2826e..0e94bb66b 100755
--- a/Tools/travis-linux-install.sh
+++ b/Tools/travis-linux-install.sh
@@ -11,6 +11,8 @@ else
 	sudo apt-get -qq install libboost-dev
 fi
 
+WITHLANG=$SWIGLANG
+
 case "$SWIGLANG" in
 	"")     ;;
 	"csharp")
@@ -75,11 +77,12 @@ case "$SWIGLANG" in
 		if [[ "$PY3" ]]; then
 			sudo apt-get install -qq python3-dev
 		fi
+		WITHLANG=$SWIGLANG$PY3
 		if [[ "$VER" ]]; then
 			sudo add-apt-repository -y ppa:fkrull/deadsnakes
 			sudo apt-get -qq update
 			sudo apt-get -qq install python${VER}-dev
-			CONFIGOPTS+=("--with-python${PY3}=python${VER}");
+			WITHLANG=$SWIGLANG$PY3=$SWIGLANG$VER
 		fi
 		;;
 	"r")
@@ -87,11 +90,11 @@ case "$SWIGLANG" in
 		;;
 	"ruby")
 		if [[ "$VER" ]]; then
-			sudo apt-get install python-software-properties
+			sudo apt-get -qq install python-software-properties
 			sudo add-apt-repository -y ppa:brightbox/ruby-ng
 			sudo apt-get -qq update
 			sudo apt-get -qq install ruby2.3 ruby2.3-dev
-			CONFIGOPTS+=("--with-ruby=ruby${VER}");
+			WITHLANG=$SWIGLANG=$SWIGLANG$VER
 		fi
 		;;
 	"scilab")
diff --git a/Tools/travis-osx-install.sh b/Tools/travis-osx-install.sh
index c85481b51..e51ea84ad 100755
--- a/Tools/travis-osx-install.sh
+++ b/Tools/travis-osx-install.sh
@@ -4,6 +4,9 @@ brew update
 brew list
 brew install pcre
 # brew install boost
+
+WITHLANG=$SWIGLANG
+
 case "$SWIGLANG" in
 	"csharp")
 		brew install https://s3.amazonaws.com/travisbuilds.swig.org/mono.rb
@@ -15,6 +18,7 @@ case "$SWIGLANG" in
 		brew install lua
 		;;
 	"python")
+		WITHLANG=$SWIGLANG$PY3
 		if [[ "$PY3" ]]; then
 			brew install python3
 			brew list -v python3