feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Simplify mapping between kits and their names

Browse Source 
Task-number: QTCREATORBUG-20861
Change-Id: I809036dc331b93f015ee5b10381229b106e27cbd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2018-08-02 19:55:52 +02:00
parent 36d21d5760
commit aed1616b35
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/system/shared/classes.py
View File

@@ -27,7 +27,7 @@ import __builtin__
# for easier re-usage (because Python hasn't an enum type) # for easier re-usage (because Python hasn't an enum type)
class Targets: class Targets:
ALL_TARGETS = tuple(map(lambda x: 2 ** x , range(5))) ALL_TARGETS = tuple(range(5))
(DESKTOP_4_8_7_DEFAULT, (DESKTOP_4_8_7_DEFAULT,
EMBEDDED_LINUX, EMBEDDED_LINUX,
@@ -35,6 +35,13 @@ class Targets:
DESKTOP_5_6_1_DEFAULT, DESKTOP_5_6_1_DEFAULT,
DESKTOP_5_10_1_DEFAULT) = ALL_TARGETS DESKTOP_5_10_1_DEFAULT) = ALL_TARGETS
__TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS,
["Desktop 4.8.7 default",
"Embedded Linux",
"Desktop 5.4.1 GCC",
"Desktop 5.6.1 default",
"Desktop 5.10.1 default"]))
@staticmethod @staticmethod
def availableTargetClasses(): def availableTargetClasses():
availableTargets = list(Targets.ALL_TARGETS) availableTargets = list(Targets.ALL_TARGETS)
@@ -51,41 +58,20 @@ class Targets:
desktopTargets.remove(Targets.EMBEDDED_LINUX) desktopTargets.remove(Targets.EMBEDDED_LINUX)
return desktopTargets return desktopTargets
@staticmethod
def qt4Classes():
return (Targets.DESKTOP_4_8_7_DEFAULT | Targets.EMBEDDED_LINUX)
@staticmethod @staticmethod
def getStringForTarget(target): def getStringForTarget(target):
if target == Targets.DESKTOP_4_8_7_DEFAULT: return Targets.__TARGET_NAME_DICT__[target]
return "Desktop 4.8.7 default"
elif target == Targets.EMBEDDED_LINUX:
return "Embedded Linux"
elif target == Targets.DESKTOP_5_4_1_GCC:
return "Desktop 5.4.1 GCC"
elif target == Targets.DESKTOP_5_6_1_DEFAULT:
return "Desktop 5.6.1 default"
elif target == Targets.DESKTOP_5_10_1_DEFAULT:
return "Desktop 5.10.1 default"
else:
return None
@staticmethod @staticmethod
def getTargetsAsStrings(targets): def getTargetsAsStrings(targets):
if not isinstance(targets, (tuple,list)): if not isinstance(targets, (tuple,list)):
test.fatal("Wrong usage... This function handles only tuples or lists.") test.fatal("Wrong usage... This function handles only tuples or lists.")
return None return None
result = map(Targets.getStringForTarget, targets) return map(Targets.getStringForTarget, targets)
if None in result:
test.fatal("You've passed at least one unknown target!")
return result
@staticmethod @staticmethod
def getIdForTargetName(targetName): def getIdForTargetName(targetName):
for id in Targets.ALL_TARGETS: return {v:k for k, v in Targets.__TARGET_NAME_DICT__.items()}[targetName]
if Targets.getStringForTarget(id) == targetName:
return id
raise Exception("'%s' is not a known target name" % targetName)
@staticmethod @staticmethod
def getDefaultKit(): def getDefaultKit():