diff options
| author | Simo Fält <simo.falt@qt.io> | 2019-06-25 09:47:54 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2019-11-29 09:23:07 +0200 |
| commit | 26404dd4b6c61083bf5de1c1c2208bf2350aba0e (patch) | |
| tree | 1ae570e6b9573ce815f16c7a51c3ab3ffed4088f /coin_test_instructions.py | |
| parent | 1fb6ba555dbe908e48a61de50418866328e5b8b1 (diff) | |
Take new Qt CI config into use
Change-Id: I32fcdaa2df6a4bed4f3263875ab1ad272ad8ff8c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_test_instructions.py')
| -rw-r--r-- | coin_test_instructions.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 8ba82c26f..5c20e9848 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -42,7 +42,6 @@ from build_scripts.utils import install_pip_dependencies from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree -from build_scripts.utils import acceptCITestConfiguration from build_scripts.utils import get_ci_qmake_path import os @@ -82,9 +81,6 @@ def call_testrunner(python_ver, buildnro): run_instruction(cmd, "Error while running wheel_tester.py") 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): @@ -97,7 +93,7 @@ def run_test_instructions(): 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"]: + if CI_RELEASE_CONF: call_testrunner("3", str(testRun)) if __name__ == "__main__": |