diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-08 11:22:33 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-11 16:02:03 +0000 |
| commit | 4de06c634f451e96b47f31324e34086b0e3a0d62 (patch) | |
| tree | 9b315326c504c6904d374957e08e3068c57ac2fb /coin_test_instructions.py | |
| parent | 98aba46414b666c27df3904d2b4313f0a16e05dc (diff) | |
Windows: Fix running the example tests in COIN
Move the logic expanding the Clang-related variables introduced by
c3fc507d3b2a502273bd92472e1e7aa459c2d13e to the COIN scripts since
they are needed when building the sample binding.
c3fc507d3b2a502273bd92472e1e7aa459c2d13e should then be reverted.
Task-number: PYSIDE-431
Change-Id: I1f118fdbd8989b7b9e3d24a249af81f4020c73f3
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 01b1d3218d70d128fe6c2f2ce3e6dce74608adaa)
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_test_instructions.py')
| -rw-r--r-- | coin_test_instructions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 6bda5b185..40f69814d 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -38,7 +38,7 @@ ############################################################################# from build_scripts.options import has_option from build_scripts.options import option_value -from build_scripts.utils import install_pip_dependencies +from build_scripts.utils import install_pip_dependencies, expand_clang_variables from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree @@ -103,6 +103,8 @@ def call_testrunner(python_ver, buildnro): def run_test_instructions(): # Remove some environment variables that impact cmake + arch = '32' if CI_TARGET_ARCH == 'X86' else '64' + expand_clang_variables(arch) for env_var in ['CC', 'CXX']: if os.environ.get(env_var): del os.environ[env_var] |