From 0633d5819f8b996b3300f177efe6b1406a1285a5 Mon Sep 17 00:00:00 2001
From: Dan Liew <daniel.liew@imperial.ac.uk>
Date: Thu, 5 Oct 2017 15:09:16 +0100
Subject: [PATCH] [TravisCI] Fix bug. `PYTHON_EXECUTABLE` should not be in
 common defaults. The location is dependent on the implementation.

This triggered a build failure on TravisCI because the location
of the default Python binary is different to what is in the Docker
container.
---
 contrib/ci/Dockerfiles/z3_build.Dockerfile      | 2 +-
 contrib/ci/scripts/ci_defaults.sh               | 2 +-
 contrib/ci/scripts/travis_ci_osx_entry_point.sh | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/ci/Dockerfiles/z3_build.Dockerfile b/contrib/ci/Dockerfiles/z3_build.Dockerfile
index 5f7608cf4..07504e6b9 100644
--- a/contrib/ci/Dockerfiles/z3_build.Dockerfile
+++ b/contrib/ci/Dockerfiles/z3_build.Dockerfile
@@ -12,7 +12,7 @@ ARG DOTNET_BINDINGS
 ARG JAVA_BINDINGS
 ARG NO_SUPPRESS_OUTPUT
 ARG PYTHON_BINDINGS
-ARG PYTHON_EXECUTABLE
+ARG PYTHON_EXECUTABLE=/usr/bin/python2.7
 ARG RUN_SYSTEM_TESTS
 ARG RUN_UNIT_TESTS
 ARG TARGET_ARCH
diff --git a/contrib/ci/scripts/ci_defaults.sh b/contrib/ci/scripts/ci_defaults.sh
index 354ea95b7..2fb3fa52a 100644
--- a/contrib/ci/scripts/ci_defaults.sh
+++ b/contrib/ci/scripts/ci_defaults.sh
@@ -9,7 +9,6 @@ export DOTNET_BINDINGS="${DOTNET_BINDINGS:-1}"
 export JAVA_BINDINGS="${JAVA_BINDINGS:-1}"
 export NO_SUPPRESS_OUTPUT="${NO_SUPPRESS_OUTPUT:-0}"
 export PYTHON_BINDINGS="${PYTHON_BINDINGS:-1}"
-export PYTHON_EXECUTABLE="${PYTHON_EXECUTABLE:-$(which python)}"
 export RUN_SYSTEM_TESTS="${RUN_SYSTEM_TESTS:-1}"
 export RUN_UNIT_TESTS="${RUN_UNIT_TESTS:-1}"
 export TARGET_ARCH="${TARGET_ARCH:-x86_64}"
@@ -49,6 +48,7 @@ unset PLATFORM
 
 # NOTE: The following variables are not set here because
 # they are specific to the CI implementation
+# PYTHON_EXECUTABLE
 # Z3_SRC_DIR
 # Z3_BUILD_DIR
 # Z3_SYSTEM_TEST_DIR
diff --git a/contrib/ci/scripts/travis_ci_osx_entry_point.sh b/contrib/ci/scripts/travis_ci_osx_entry_point.sh
index 7dd566877..ad3b0c7ab 100755
--- a/contrib/ci/scripts/travis_ci_osx_entry_point.sh
+++ b/contrib/ci/scripts/travis_ci_osx_entry_point.sh
@@ -19,8 +19,9 @@ if [ ! -d "${TRAVIS_BUILD_DIR}" ]; then
   exit 1
 fi
 
-# These three variables are specific to the macOS TravisCI
+# These variables are specific to the macOS TravisCI
 # implementation and are not set in `ci_defaults.sh`.
+export PYTHON_EXECUTABLE="${PYTHON_EXECUTABLE:-$(which python)}"
 export Z3_SRC_DIR="${TRAVIS_BUILD_DIR}"
 export Z3_BUILD_DIR="${Z3_SRC_DIR}/build"
 export Z3_SYSTEM_TEST_DIR="${Z3_SRC_DIR}/z3_system_test"