Squish: Added kit "Desktop 480 GCC"

Change-Id: I20296f8819837fd613c6328d6c19fc8be82927b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

5 files changed, 62 insertions, 18 deletions

diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
index 341dcd6bda..7eac69d2df 100644
--- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProfiles>
-<!-- Written by QtCreator 2.7.1, 2013-03-26T13:04:29. -->
+<!-- Written by QtCreator 2.8.0, 2013-07-12T18:17:23. -->
 <qtcreator>
  <data>
   <variable>Profile.0</variable>
@@ -129,8 +129,28 @@
   </valuemap>
  </data>
  <data>
+  <variable>Profile.6</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <value type="QString" key="Debugger.Information">/usr/bin/gdb</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371}</value>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">2</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{1dcb5509-1670-470d-80a5-8a988f36e4e2}</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 480 GCC</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+  </valuemap>
+ </data>
+ <data>
   <variable>Profile.Count</variable>
-  <value type="int">6</value>
+  <value type="int">7</value>
  </data>
  <data>
   <variable>Profile.Default</variable>
diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
index b5bac3648c..faa3216ef0 100644
--- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
+++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProfiles>
-<!-- Written by QtCreator 2.7.1, 2013-03-22T16:13:19. -->
+<!-- Written by QtCreator 2.8.1, 2013-07-12T17:36:49. -->
 <qtcreator>
  <data>
   <variable>Profile.0</variable>
@@ -132,8 +132,28 @@
   </valuemap>
  </data>
  <data>
+  <variable>Profile.6</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="PE.Profile.AutoDetected">false</value>
+   <valuemap type="QVariantMap" key="PE.Profile.Data">
+    <value type="QString" key="Android.GdbServer.Information"></value>
+    <value type="QString" key="Debugger.Information">C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
+    <value type="QString" key="PE.Profile.Device">Desktop Device</value>
+    <value type="QByteArray" key="PE.Profile.DeviceType">Desktop</value>
+    <value type="QString" key="PE.Profile.SysRoot"></value>
+    <value type="QString" key="PE.Profile.ToolChain">ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce}</value>
+    <value type="QString" key="QtPM4.mkSpecInformation"></value>
+    <value type="int" key="QtSupport.QtInformation">3</value>
+   </valuemap>
+   <value type="QString" key="PE.Profile.Icon">:///DESKTOP///</value>
+   <value type="QString" key="PE.Profile.Id">{9dc9de67-fdc0-4ba6-877a-1463aacd3b3e}</value>
+   <value type="QString" key="PE.Profile.Name">Desktop 480 GCC</value>
+   <value type="bool" key="PE.Profile.SDK">false</value>
+  </valuemap>
+ </data>
+ <data>
   <variable>Profile.Count</variable>
-  <value type="int">6</value>
+  <value type="int">7</value>
  </data>
  <data>
   <variable>Profile.Default</variable>
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index 04b362465f..d7ba25101e 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -32,16 +32,17 @@ import operator
 # for easier re-usage (because Python hasn't an enum type)
 class Targets:
     DESKTOP_474_GCC = 1
-    SIMULATOR = 2
-    MAEMO5 = 4
-    HARMATTAN = 8
-    EMBEDDED_LINUX = 16
-    DESKTOP_480_MSVC2010 = 32
-    DESKTOP_501_DEFAULT = 64
+    DESKTOP_480_GCC = 2
+    SIMULATOR = 4
+    MAEMO5 = 8
+    HARMATTAN = 16
+    EMBEDDED_LINUX = 32
+    DESKTOP_480_MSVC2010 = 64
+    DESKTOP_501_DEFAULT = 128
 
     @staticmethod
     def desktopTargetClasses():
-        desktopTargets = Targets.DESKTOP_474_GCC | Targets.DESKTOP_501_DEFAULT
+        desktopTargets = Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC | Targets.DESKTOP_501_DEFAULT
         if platform.system() in ('Windows', 'Microsoft'):
             desktopTargets |= Targets.DESKTOP_480_MSVC2010
         return desktopTargets
@@ -50,6 +51,8 @@ class Targets:
     def getStringForTarget(target):
         if target == Targets.DESKTOP_474_GCC:
             return "Desktop 474 GCC"
+        if target == Targets.DESKTOP_480_GCC:
+            return "Desktop 480 GCC"
         elif target == Targets.MAEMO5:
             return "Fremantle"
         elif target == Targets.SIMULATOR:
@@ -77,8 +80,8 @@ class Targets:
 
     @staticmethod
     def intToArray(targets):
-        available = [Targets.DESKTOP_474_GCC, Targets.SIMULATOR, Targets.MAEMO5, Targets.HARMATTAN,
-                     Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010,
+        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.SIMULATOR, Targets.MAEMO5,
+                     Targets.HARMATTAN, Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010,
                      Targets.DESKTOP_501_DEFAULT]
         return filter(lambda x: x & targets == x, available)
 
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index a3c9797070..58a0531c36 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -290,8 +290,8 @@ 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_501_DEFAULT, Targets.MAEMO5,
-                     Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN]
+        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_501_DEFAULT,
+                     Targets.MAEMO5, Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
             available.remove(Targets.EMBEDDED_LINUX)
             available.append(Targets.DESKTOP_480_MSVC2010)
@@ -481,6 +481,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
         result = []
         if 'Desktop' in supports:
             result.append(Targets.DESKTOP_474_GCC)
+            result.append(Targets.DESKTOP_480_GCC)
             result.append(Targets.DESKTOP_501_DEFAULT)
             if platform.system() in ("Linux", "Darwin"):
                 result.append(Targets.EMBEDDED_LINUX)
@@ -494,8 +495,8 @@ def __getSupportedPlatforms__(text, 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_501_DEFAULT, Targets.MAEMO5,
-                  Targets.SIMULATOR, Targets.HARMATTAN]
+        result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_501_DEFAULT,
+                  Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
             result.append(Targets.DESKTOP_480_MSVC2010)
     else:
diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py
index 164e410718..98468fd7c0 100644
--- a/tests/system/suite_general/tst_build_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_build_speedcrunch/test.py
@@ -46,7 +46,7 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    suitableKits = Targets.DESKTOP_474_GCC
+    suitableKits = Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC
     if platform.system() in ('Windows', 'Microsoft'):
         suitableKits |= Targets.DESKTOP_480_MSVC2010
     checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits)