summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2018-06-07 13:23:39 +0300
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-06-08 08:34:22 +0000
commita861552bdaddd384749aca3359b9f9da61735a29 (patch)
tree42895236018b76aecafaed7c59929bb47f2b0480
parent3a5b455a8ae6cf6f911078d66deaed64dce33af8 (diff)
Skip building on Windows for Python2
Change-Id: Ie6970361748f5b7dab52a401f6e3cf7995015ee7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--coin_build_instructions.py4
-rw-r--r--coin_test_instructions.py8
2 files changed, 9 insertions, 3 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index c48f5e3b..df70d52e 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -132,7 +132,9 @@ def run_build_instructions():
exit()
# Uses default python, hopefully we have python2 installed on all hosts
- call_setup("")
+ # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+)
+ if CI_HOST_OS != "Windows":
+ call_setup("")
# In case of packaging build, we have to build also python3 wheel
if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]:
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index c9c184dd..ffbf001f 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -81,10 +81,14 @@ def run_test_instructions():
exit()
os.chdir(CI_ENV_AGENT_DIR)
- call_testrunner("", "0")
+ testRun = 0
+ # We didn't build for Python 2 in win
+ if CI_HOST_OS != "Windows":
+ call_testrunner("", str(testRun))
+ testRun =+ 1
# We know that second build was with python3
if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]:
- call_testrunner("3", "1")
+ call_testrunner("3", str(testRun))
if __name__ == "__main__":
run_test_instructions()