diff options
Diffstat (limited to 'tests/system')
6 files changed, 24 insertions, 6 deletions
diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index 733943d160..985ec0bcf9 100755 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -14,7 +14,10 @@ def main(): # open example project openQmakeProject(examplePath) # build and wait until finished - on all (except Qt 4.7.0 (would fail)) build configurations - for config in iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)"): + availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.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: selectBuildConfig(1, 0, config) # try to build project test.log("Testing build configuration: " + config) diff --git a/tests/system/suite_SCOM/tst_SCOM01/test.py b/tests/system/suite_SCOM/tst_SCOM01/test.py index 4b4fb5f21e..0bc53c3912 100644 --- a/tests/system/suite_SCOM/tst_SCOM01/test.py +++ b/tests/system/suite_SCOM/tst_SCOM01/test.py @@ -7,7 +7,10 @@ def main(): # create qt quick application createNewQtQuickApplication(tempDir(), "SampleApp") # build it - on all (except Qt 4.7.0 (would fail)) build configurations - for config in iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)"): + availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.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: selectBuildConfig(1, 0, config) # try to compile test.log("Testing build configuration: " + config) diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py index fecef36c57..bb4a99f10e 100644 --- a/tests/system/suite_SCOM/tst_SCOM04/test.py +++ b/tests/system/suite_SCOM/tst_SCOM04/test.py @@ -17,7 +17,10 @@ def main(): # save all invokeMenuItem("File", "Save All") # build it - on all (except Qt 4.7.0 (would fail)) build configurations - for config in iterateBuildConfigs(1, 0, "(?!.*4\.7\.0.*)"): + availableConfigs = iterateBuildConfigs(1, 0, "(?!.*4\.7\.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: selectBuildConfig(1, 0, config) # try to compile test.log("Testing build configuration: " + config) diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py index 73a46f61ee..cd33ccfbbf 100644 --- a/tests/system/suite_debugger/tst_build_new_project/test.py +++ b/tests/system/suite_debugger/tst_build_new_project/test.py @@ -6,7 +6,10 @@ project = "SquishProject" def main(): startApplication("qtcreator" + SettingsPath) createProject_Qt_Console(projectsPath, project) - for config in iterateBuildConfigs(1, 0): + availableConfigs = iterateBuildConfigs(1, 0) + if not availableConfigs: + test.fatal("Haven't found a suitable Qt version - leaving without building.") + for config in availableConfigs: selectBuildConfig(1, 0, config) test.log("Testing build configuration: " + config) runAndCloseApp() diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py index 50c8a7645c..692c01a5bd 100644 --- a/tests/system/suite_debugger/tst_cli_output_console/test.py +++ b/tests/system/suite_debugger/tst_cli_output_console/test.py @@ -37,7 +37,10 @@ def main(): test.verify("CONFIG += console" in str(proEditor.plainText), "Verifying that program is configured with console") setRunInTerminal(1, 0, False) - for config in iterateBuildConfigs(1, 0): + availableConfigs = iterateBuildConfigs(1, 0) + if not availableConfigs: + test.fatal("Haven't found a suitable Qt version - leaving without building.") + for config in availableConfigs: selectBuildConfig(1, 0, config) test.log("Testing build configuration: " + config) diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py index cd2c09879a..147cc967fc 100644 --- a/tests/system/suite_general/tst_build_speedcrunch/test.py +++ b/tests/system/suite_general/tst_build_speedcrunch/test.py @@ -27,7 +27,10 @@ def main(): fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton") qtVerPattern = re.compile("\d\.\d(\.\d+)?") - for config in iterateBuildConfigs(1, 0, "(Desktop )?Qt.*Release"): + availableConfigs = iterateBuildConfigs(1, 0, "(Desktop )?Qt.*Release") + if not availableConfigs: + test.fatal("Haven't found a suitable Qt version (need Release build) - leaving without building.") + for config in availableConfigs: qtVersion = qtVerPattern.search(config) if qtVersion: qtVersion = qtVersion.group() |