diff --git a/tests/system/suite_APTW/shared/aptw.py b/tests/system/suite_APTW/shared/aptw.py index eed8dd7e94c38f2b6321c8031dcb9f8b6c6b079a..fbffbfe30aff76250d83d6d8ecd4e182c981055d 100755 --- a/tests/system/suite_APTW/shared/aptw.py +++ b/tests/system/suite_APTW/shared/aptw.py @@ -15,7 +15,7 @@ def verifyBuildAndRun(): # pick version 4.7.4 and then run project for debug and release def pickVersion474runVerify(): - availableConfigs = iterateBuildConfigs(1, 0, ".*4.7.4.*") + availableConfigs = iterateBuildConfigs(1, 0) if not availableConfigs: test.fatal("Haven't found needed Qt version (Qt 4.7.4), quitting") invokeMenuItem("File", "Save All") diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index 985ec0bcf9b9168e17cdeba423ff2ea05d36efa3..cf122d145dccc13c3a6757c37801b18f09ee778c 100755 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -14,7 +14,7 @@ def main(): # open example project openQmakeProject(examplePath) # build and wait until finished - on all (except Qt 4.7.0 (would fail)) build configurations - availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)") + availableConfigs = iterateBuildConfigs(1, 0) if not availableConfigs: test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.") for config in availableConfigs: diff --git a/tests/system/suite_SCOM/tst_SCOM01/test.py b/tests/system/suite_SCOM/tst_SCOM01/test.py index 0bc53c391262799d827799797b52a6a774615100..14a9e70954b8f23d69e19a195b16a8ddb0da386a 100644 --- a/tests/system/suite_SCOM/tst_SCOM01/test.py +++ b/tests/system/suite_SCOM/tst_SCOM01/test.py @@ -7,7 +7,7 @@ def main(): # create qt quick application createNewQtQuickApplication(tempDir(), "SampleApp") # build it - on all (except Qt 4.7.0 (would fail)) build configurations - availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)") + availableConfigs = iterateBuildConfigs(1, 0) if not availableConfigs: test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.") for config in availableConfigs: diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py index bb4a99f10e0b6634043db2f3cdf8a79e8bfdfca8..8ba9b8938e6209dae25701a0b973c710f65a3b4e 100644 --- a/tests/system/suite_SCOM/tst_SCOM04/test.py +++ b/tests/system/suite_SCOM/tst_SCOM04/test.py @@ -17,7 +17,7 @@ def main(): # save all invokeMenuItem("File", "Save All") # build it - on all (except Qt 4.7.0 (would fail)) build configurations - availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)") + availableConfigs = iterateBuildConfigs(1, 0) if not availableConfigs: test.fatal("Haven't found a suitable Qt version (anything except Qt 4.7.0) - leaving without building.") for config in availableConfigs: diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index b7c818aa2eb50963b2d7745f497039455b70b59c..3a4e0721ee9bad1c11d783e77890b59faf5ad16b 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -34,7 +34,7 @@ def main(): if result: expectedBreakpointsOrder = [{"main.cpp":9}, {"main.qml":14}] # Only use 4.7.4 to work around QTBUG-25187 - availableConfigs = iterateBuildConfigs(1, 0, ".*4\.7\.4.*$(?<![Rr]elease)") + availableConfigs = iterateBuildConfigs(1, 0, "Debug") if not availableConfigs: test.fatal("Haven't found a suitable Qt version (need Qt 4.7.4) - leaving without debugging.") for config in availableConfigs: diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py index bb10b13c7144860518665fae54cce782ef209512..2425b05169d4fa7c3bfdb43d7bc9f84217571b53 100644 --- a/tests/system/suite_general/tst_build_speedcrunch/test.py +++ b/tests/system/suite_general/tst_build_speedcrunch/test.py @@ -21,7 +21,7 @@ def main(): fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton") qtVerPattern = re.compile("\d\.\d(\.\d+)?") - availableConfigs = iterateBuildConfigs(1, 0, "(Desktop )?Qt.*Release") + availableConfigs = iterateBuildConfigs(1, 0, "Release") if not availableConfigs: test.fatal("Haven't found a suitable Qt version (need Release build) - leaving without building.") for config in availableConfigs: