summaryrefslogtreecommitdiffstats
path: root/coin_test_instructions.py
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2018-06-01 23:48:46 +0300
committerSimo Fält <simo.falt@qt.io>2018-06-04 12:38:19 +0000
commit33943b54e9470dc8830e94270e6521524acb2954 (patch)
treed97fbd7f1fe82dd3bce3aa3d78a98194bf9ffbc7 /coin_test_instructions.py
parenta50f4de8d5116f032609d97a986801888b1008f7 (diff)
Refactor accepted CI configurations
Change-Id: I7baa695fe4100e15b108e4eb7df15c6af7db2cbe Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin_test_instructions.py')
-rw-r--r--coin_test_instructions.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index 350e33b0..e9031678 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -42,6 +42,7 @@ 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
import os
# Values must match COIN thrift
@@ -72,12 +73,7 @@ def call_testrunner(python_ver, buildnro):
run_instruction(cmd, "Failed to run testrunner.py")
def run_test_instructions():
- # Disable unsupported configs for now
- if CI_HOST_OS_VER in ["WinRT_10"]:
- print("Disabled " + CI_HOST_OS_VER + " from Coin configuration")
- exit()
- if CI_COMPILER in ["MSVC2015"] and CI_TARGET_ARCH in ["X86_64"]:
- print("Disabled " + CI_HOST_OS_VER + " from Coin configuration")
+ if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER):
exit()
os.chdir(CI_ENV_AGENT_DIR)