diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2022-03-23 13:28:27 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2022-03-24 05:55:16 +0000 |
| commit | c1b585933bcacee610079f3067ff35efeae1e721 (patch) | |
| tree | 43b4d9db1be0f8825c0ee81eec2e34205e5f5938 | |
| parent | fcddfe5a8cb33f9e3ac8a7a0f22a49cbef487166 (diff) | |
| download | qt-creator-c1b585933bcacee610079f3067ff35efeae1e721.tar.gz | |
Squish: Fix remove kits test
cmake is automatically running when re-opening a project
and creates a temporary kit which was different when using qmake.
Switch back to qmake and enhance later to support cmake as well.
Change-Id: Id3e1dc23c828a6e2af5454863e1349d9866dfa38
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
| -rw-r--r-- | tests/system/shared/classes.py | 6 | ||||
| -rw-r--r-- | tests/system/suite_general/tst_remove_kits/test.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index d43c15a63a..efe60daa70 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -46,11 +46,11 @@ class Targets: "Desktop 5.14.1 default"])) @staticmethod - def availableTargetClasses(): + def availableTargetClasses(ignoreValidity=False): availableTargets = set(Targets.ALL_TARGETS) - if not qt4Available: + if not qt4Available and not ignoreValidity: availableTargets.remove(Targets.DESKTOP_4_8_7_DEFAULT) - if not qt4Available or platform.system() in ('Windows', 'Microsoft'): + if not (qt4Available or ignoreValidity) or platform.system() in ('Windows', 'Microsoft'): availableTargets.remove(Targets.EMBEDDED_LINUX) elif platform.system() == 'Darwin': availableTargets.remove(Targets.DESKTOP_5_4_1_GCC) diff --git a/tests/system/suite_general/tst_remove_kits/test.py b/tests/system/suite_general/tst_remove_kits/test.py index b3376d7160..8549d285ca 100644 --- a/tests/system/suite_general/tst_remove_kits/test.py +++ b/tests/system/suite_general/tst_remove_kits/test.py @@ -54,9 +54,9 @@ def main(): startQC() if not startedWithoutPluginError(): return - createProject_Qt_Console(tempDir(), "SquishProject") + createProject_Qt_Console(tempDir(), "SquishProject", buildSystem = "qmake") switchViewTo(ViewConstants.PROJECTS) - verifyProjectsMode(Targets.getTargetsAsStrings(Targets.availableTargetClasses())) + verifyProjectsMode(Targets.getTargetsAsStrings(Targets.availableTargetClasses(True))) iterateKits(True, False, __removeKit__) clickButton(waitForObject(":Options.OK_QPushButton")) verifyProjectsMode([]) |