Squish: Simplify maintenance of kitsv3.4.0-rc1

Change-Id: I757ff8991f1f2c54789b3b536c0300e0fe643bf2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

2 files changed, 23 insertions, 26 deletions

diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index b3de5a34dd..de02b8e5d3 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -32,22 +32,24 @@ import operator
 
 # for easier re-usage (because Python hasn't an enum type)
 class Targets:
-    DESKTOP_474_GCC = 1
-    DESKTOP_480_DEFAULT = 2
-    SIMULATOR = 4
-    MAEMO5 = 8
-    HARMATTAN = 16
-    EMBEDDED_LINUX = 32
-    DESKTOP_521_DEFAULT = 64
-    DESKTOP_531_DEFAULT = 128
-    DESKTOP_541_GCC = 256
+    ALL_TARGETS = map(lambda x: 2 ** x , range(9))
+
+    (DESKTOP_474_GCC,
+     DESKTOP_480_DEFAULT,
+     SIMULATOR,
+     MAEMO5,
+     HARMATTAN,
+     EMBEDDED_LINUX,
+     DESKTOP_521_DEFAULT,
+     DESKTOP_531_DEFAULT,
+     DESKTOP_541_GCC) = ALL_TARGETS
 
     @staticmethod
     def desktopTargetClasses():
-        desktopTargets = (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_DEFAULT
-                          | Targets.DESKTOP_521_DEFAULT | Targets.DESKTOP_531_DEFAULT)
-        if platform.system() != 'Darwin':
-            desktopTargets |= Targets.DESKTOP_541_GCC
+        desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.SIMULATOR & ~Targets.MAEMO5
+                          & ~Targets.HARMATTAN & ~Targets.EMBEDDED_LINUX)
+        if platform.system() == 'Darwin':
+            desktopTargets &= ~Targets.DESKTOP_541_GCC
         return desktopTargets
 
     @staticmethod
@@ -88,10 +90,7 @@ class Targets:
 
     @staticmethod
     def intToArray(targets):
-        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_DEFAULT, Targets.SIMULATOR,
-                     Targets.MAEMO5, Targets.HARMATTAN, Targets.EMBEDDED_LINUX,
-                     Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_541_GCC]
-        return filter(lambda x: x & targets == x, available)
+        return filter(lambda x: x & targets, Targets.ALL_TARGETS)
 
     @staticmethod
     def arrayToInt(targetArr):
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index a127197286..609bc6a03f 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -389,13 +389,11 @@ 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 = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_DEFAULT, Targets.DESKTOP_521_DEFAULT,
-                     Targets.DESKTOP_531_DEFAULT, Targets.MAEMO5, Targets.EMBEDDED_LINUX,
-                     Targets.SIMULATOR, Targets.HARMATTAN]
+        available = Targets.ALL_TARGETS
         if platform.system() in ('Windows', 'Microsoft'):
             available.remove(Targets.EMBEDDED_LINUX)
-        if platform.system() != 'Darwin':
-            available.append(Targets.DESKTOP_541_GCC)
+        elif platform.system() == 'Darwin':
+            available.remove(Targets.DESKTOP_541_GCC)
     for target in filter(lambda x: x in available,
                          (Targets.MAEMO5, Targets.HARMATTAN)):
         available.remove(target)
@@ -634,10 +632,10 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False):
             result.append(Targets.SIMULATOR)
     elif 'Platform independent' in text:
         # MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
-        result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_DEFAULT, Targets.DESKTOP_521_DEFAULT,
-                  Targets.DESKTOP_531_DEFAULT, Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN]
-        if platform.system() != 'Darwin':
-            result.append(Targets.DESKTOP_541_GCC)
+        result = Targets.ALL_TARGETS
+        result.remove(Targets.EMBEDDED_LINUX)
+        if platform.system() == 'Darwin':
+            result.remove(Targets.DESKTOP_541_GCC)
     else:
         test.warning("Returning None (__getSupportedPlatforms__())",
                      "Parsed text: '%s'" % text)