From 4de06c634f451e96b47f31324e34086b0e3a0d62 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 8 Jan 2021 11:22:33 +0100 Subject: Windows: Fix running the example tests in COIN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 01b1d3218d70d128fe6c2f2ce3e6dce74608adaa) Reviewed-by: Cristian Maureira-Fredes --- coin_test_instructions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'coin_test_instructions.py') 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] -- cgit v1.2.3