summaryrefslogtreecommitdiffstats
path: root/coin_test_instructions.py
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2018-05-16 10:50:52 +0300
committerSimo Fält <simo.falt@qt.io>2018-05-17 09:28:04 +0000
commit0c83e2408b81ec62e8eb787b01518ccb46236fc4 (patch)
treec59d8306abc5f4899674694a72f91913ca12d811 /coin_test_instructions.py
parent6033f4a3425268b8c4aa1f61f7bd8b247a1ff380 (diff)
Select correct Python environment when cross compiling
To be able to create 32 bit wheel in 64 bit Windows, we must use correct Python version. Task-number: PYSIDE-646 Change-Id: I72c05e9c5b6f37f16c118e36c3c7ea8f90ee7dff Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin_test_instructions.py')
-rw-r--r--coin_test_instructions.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index 42c14647..29b66454 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -47,6 +47,8 @@ import os
# Values must match COIN thrift
CI_HOST_OS = option_value("os")
CI_TARGET_OS = option_value("targetOs")
+CI_HOST_ARCH = option_value("hostArch")
+CI_TARGET_ARCH = option_value("targetArch")
CI_HOST_OS_VER = option_value("osVer")
CI_ENV_INSTALL_DIR = option_value("instdir")
CI_ENV_AGENT_DIR = option_value("agentdir") or "."
@@ -60,7 +62,7 @@ if _ci_features is not None:
CI_RELEASE_CONF = has_option("packaging")
def call_testrunner(python_ver, buildnro):
- _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS)
+ _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, CI_TARGET_ARCH)
rmtree(_env, True)
run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv")
install_pip_dependencies(env_pip, ["six", "wheel"])