diff options
| author | Robert Loehning <robert.loehning@qt.io> | 2017-03-02 17:47:20 +0100 |
|---|---|---|
| committer | Robert Loehning <robert.loehning@qt.io> | 2017-03-03 12:32:51 +0000 |
| commit | 9c118fb8f27b66f61f99d3fad0e57caac831934f (patch) | |
| tree | a741896d1062ea5836c873f504a22dc262d3787b | |
| parent | f78327a571a70f949574294a525cb0ef910c46f1 (diff) | |
| download | qt-creator-9c118fb8f27b66f61f99d3fad0e57caac831934f.tar.gz | |
Squish: Add function returning all available kits
Change-Id: I6699ad5c869dbbd413d0b1d113a169c2ec06511c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | tests/system/shared/classes.py | 16 | ||||
| -rw-r--r-- | tests/system/shared/project.py | 11 |
2 files changed, 14 insertions, 13 deletions
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 3defd01252..fa8549b12c 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -38,11 +38,19 @@ class Targets: DESKTOP_561_DEFAULT) = ALL_TARGETS @staticmethod + def availableTargetClasses(): + availableTargets = list(Targets.ALL_TARGETS) + if platform.system() in ('Windows', 'Microsoft'): + availableTargets.remove(Targets.EMBEDDED_LINUX) + elif platform.system() == 'Darwin': + availableTargets.remove(Targets.DESKTOP_541_GCC) + return availableTargets + + @staticmethod def desktopTargetClasses(): - desktopTargets = list(Targets.ALL_TARGETS) - desktopTargets.remove(Targets.EMBEDDED_LINUX) - if platform.system() == 'Darwin': - desktopTargets.remove(Targets.DESKTOP_541_GCC) + desktopTargets = Targets.availableTargetClasses() + if Targets.EMBEDDED_LINUX in desktopTargets: + desktopTargets.remove(Targets.EMBEDDED_LINUX) return desktopTargets @staticmethod diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index b08384544d..0e2bdd9e35 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -396,11 +396,7 @@ def __chooseTargets__(targets=[Targets.DESKTOP_474_GCC], availableTargets=None, available = availableTargets else: # following targets depend on the build environment - added for further/later tests - available = list(Targets.ALL_TARGETS) - if platform.system() in ('Windows', 'Microsoft'): - available.remove(Targets.EMBEDDED_LINUX) - elif platform.system() == 'Darwin': - available.remove(Targets.DESKTOP_541_GCC) + available = Targets.availableTargetClasses() checkedTargets = [] for current in available: mustCheck = current in targets @@ -642,10 +638,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): if platform.system() != 'Darwin': result.append(Targets.DESKTOP_541_GCC) elif 'Platform independent' in text: - result = list(Targets.ALL_TARGETS) - result.remove(Targets.EMBEDDED_LINUX) - if platform.system() == 'Darwin': - result.remove(Targets.DESKTOP_541_GCC) + result = Targets.desktopTargetClasses() else: test.warning("Returning None (__getSupportedPlatforms__())", "Parsed text: '%s'" % text) |