diff options
| author | Robert Loehning <robert.loehning@digia.com> | 2012-10-29 19:22:43 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@digia.com> | 2012-10-30 09:54:22 +0100 |
| commit | e60d2af0b18c03eb333eedf9bafe9e053d50af87 (patch) | |
| tree | ccb3180bace1027ac722f6770c4301acb84d09d3 /tests/system/suite_SCOM | |
| parent | 20d4efb0b1d9d17ca5c6e4487214f9b2c0ef43b5 (diff) | |
| download | qt-creator-e60d2af0b18c03eb333eedf9bafe9e053d50af87.tar.gz | |
Squish: Updated iterateBuildConfigs() to handle multiple kits
Change-Id: I724e45bf510015dbdae6cb4c6cb55285167dafbc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'tests/system/suite_SCOM')
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM01/test.py | 10 | ||||
| -rw-r--r-- | tests/system/suite_SCOM/tst_SCOM04/test.py | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/system/suite_SCOM/tst_SCOM01/test.py b/tests/system/suite_SCOM/tst_SCOM01/test.py index df7578df06..94871997a1 100644 --- a/tests/system/suite_SCOM/tst_SCOM01/test.py +++ b/tests/system/suite_SCOM/tst_SCOM01/test.py @@ -6,12 +6,12 @@ def main(): startApplication("qtcreator" + SettingsPath) # create qt quick application createNewQtQuickApplication(tempDir(), "SampleApp") - # build it - on all (except Qt 4.7.0 (would fail)) build configurations - availableConfigs = iterateBuildConfigs(1, 0) + # build it - on all build configurations + availableConfigs = iterateBuildConfigs(1) 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) + test.fatal("Haven't found a suitable Qt version - leaving without building.") + for kit, config in availableConfigs: + selectBuildConfig(1, kit, config) # try to compile test.log("Testing build configuration: " + config) clickButton(waitForObject(":*Qt Creator.Build Project_Core::Internal::FancyToolButton")) diff --git a/tests/system/suite_SCOM/tst_SCOM04/test.py b/tests/system/suite_SCOM/tst_SCOM04/test.py index 369dbe0b76..da81053eaa 100644 --- a/tests/system/suite_SCOM/tst_SCOM04/test.py +++ b/tests/system/suite_SCOM/tst_SCOM04/test.py @@ -16,12 +16,12 @@ def main(): return # save all invokeMenuItem("File", "Save All") - # build it - on all (except Qt 4.7.0 (would fail)) build configurations - availableConfigs = iterateBuildConfigs(1, 0) + # build it - on all build configurations + availableConfigs = iterateBuildConfigs(1) 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) + test.fatal("Haven't found a suitable Qt version - leaving without building.") + for kit, config in availableConfigs: + selectBuildConfig(1, kit, config) # try to compile test.log("Testing build configuration: " + config) clickButton(waitForObject(":*Qt Creator.Build Project_Core::Internal::FancyToolButton")) |