diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-22 14:55:21 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-23 09:40:15 +0100 |
| commit | 34e6ac44ef6d322760fcda02136b25a097b0fe15 (patch) | |
| tree | 50f3494be415740932576437782b1716493b4f2b /coin_test_instructions.py | |
| parent | f5ee713b60b541ad9d9cac11fa65b4b1091e25ac (diff) | |
| parent | cebc32a588358851dd58dc0fc892e986dd263efb (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I61b563bce41b43dda2b03ea46a456228435bc294
Diffstat (limited to 'coin_test_instructions.py')
| -rw-r--r-- | coin_test_instructions.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 4121bb558..7fbe540b4 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -87,6 +87,11 @@ def run_test_instructions(): if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): exit() + # Remove some environment variables that impact cmake + for env_var in ['CC', 'CXX']: + if os.environ.get(env_var): + del os.environ[env_var] + os.chdir(CI_ENV_AGENT_DIR) testRun = 0 # We didn't build for Python 2 in win |