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

Squish: Added kit "Desktop 480 GCC"

Browse Source 
Change-Id: I20296f8819837fd613c6328d6c19fc8be82927b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Robert Loehning
2013-07-12 18:28:46 +02:00
parent 9cb5e5c3f0
commit 8050e136e7
5 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/system/settings/unix/QtProject/qtcreator/profiles.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles> <!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> <qtcreator>
<data> <data>
<variable>Profile.0</variable> <variable>Profile.0</variable>
@@ -128,9 +128,29 @@
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </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> <data>
<variable>Profile.Count</variable> <variable>Profile.Count</variable>
<value type="int">6</value> <value type="int">7</value>
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>

24
tests/system/settings/windows/QtProject/qtcreator/profiles.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProfiles> <!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> <qtcreator>
<data> <data>
<variable>Profile.0</variable> <variable>Profile.0</variable>
@@ -131,9 +131,29 @@
<value type="bool" key="PE.Profile.SDK">false</value> <value type="bool" key="PE.Profile.SDK">false</value>
</valuemap> </valuemap>
</data> </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> <data>
<variable>Profile.Count</variable> <variable>Profile.Count</variable>
<value type="int">6</value> <value type="int">7</value>
</data> </data>
<data> <data>
<variable>Profile.Default</variable> <variable>Profile.Default</variable>

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

@@ -32,16 +32,17 @@ import operator
# 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:
DESKTOP_474_GCC = 1 DESKTOP_474_GCC = 1
SIMULATOR = 2 DESKTOP_480_GCC = 2
MAEMO5 = 4 SIMULATOR = 4
HARMATTAN = 8 MAEMO5 = 8
EMBEDDED_LINUX = 16 HARMATTAN = 16
DESKTOP_480_MSVC2010 = 32 EMBEDDED_LINUX = 32
DESKTOP_501_DEFAULT = 64 DESKTOP_480_MSVC2010 = 64
DESKTOP_501_DEFAULT = 128
@staticmethod @staticmethod
def desktopTargetClasses(): 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'): if platform.system() in ('Windows', 'Microsoft'):
desktopTargets |= Targets.DESKTOP_480_MSVC2010 desktopTargets |= Targets.DESKTOP_480_MSVC2010
return desktopTargets return desktopTargets
@@ -50,6 +51,8 @@ class Targets:
def getStringForTarget(target): def getStringForTarget(target):
if target == Targets.DESKTOP_474_GCC: if target == Targets.DESKTOP_474_GCC:
return "Desktop 474 GCC" return "Desktop 474 GCC"
if target == Targets.DESKTOP_480_GCC:
return "Desktop 480 GCC"
elif target == Targets.MAEMO5: elif target == Targets.MAEMO5:
return "Fremantle" return "Fremantle"
elif target == Targets.SIMULATOR: elif target == Targets.SIMULATOR:
@@ -77,8 +80,8 @@ class Targets:
@staticmethod @staticmethod
def intToArray(targets): def intToArray(targets):
available = [Targets.DESKTOP_474_GCC, Targets.SIMULATOR, Targets.MAEMO5, Targets.HARMATTAN, available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.SIMULATOR, Targets.MAEMO5,
Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010, Targets.HARMATTAN, Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010,
Targets.DESKTOP_501_DEFAULT] Targets.DESKTOP_501_DEFAULT]
return filter(lambda x: x & targets == x, available) return filter(lambda x: x & targets == x, available)

9
tests/system/shared/project.py
View File

@@ -290,8 +290,8 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None,
available = availableTargets available = availableTargets
else: else:
# following targets depend on the build environment - added for further/later tests # following targets depend on the build environment - added for further/later tests
available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_501_DEFAULT, Targets.MAEMO5, available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_501_DEFAULT,
Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN] Targets.MAEMO5, Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
available.remove(Targets.EMBEDDED_LINUX) available.remove(Targets.EMBEDDED_LINUX)
available.append(Targets.DESKTOP_480_MSVC2010) available.append(Targets.DESKTOP_480_MSVC2010)
@@ -481,6 +481,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
result = [] result = []
if 'Desktop' in supports: if 'Desktop' in supports:
result.append(Targets.DESKTOP_474_GCC) result.append(Targets.DESKTOP_474_GCC)
result.append(Targets.DESKTOP_480_GCC)
result.append(Targets.DESKTOP_501_DEFAULT) result.append(Targets.DESKTOP_501_DEFAULT)
if platform.system() in ("Linux", "Darwin"): if platform.system() in ("Linux", "Darwin"):
result.append(Targets.EMBEDDED_LINUX) result.append(Targets.EMBEDDED_LINUX)
@@ -494,8 +495,8 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
result.append(Targets.SIMULATOR) result.append(Targets.SIMULATOR)
elif 'Platform independent' in text: elif 'Platform independent' in text:
# MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not # 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, result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_501_DEFAULT,
Targets.SIMULATOR, Targets.HARMATTAN] Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN]
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
result.append(Targets.DESKTOP_480_MSVC2010) result.append(Targets.DESKTOP_480_MSVC2010)
else: else:

2
tests/system/suite_general/tst_build_speedcrunch/test.py
View File

@@ -46,7 +46,7 @@ def main():
startApplication("qtcreator" + SettingsPath) startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError(): if not startedWithoutPluginError():
return return
suitableKits = Targets.DESKTOP_474_GCC suitableKits = Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC
if platform.system() in ('Windows', 'Microsoft'): if platform.system() in ('Windows', 'Microsoft'):
suitableKits |= Targets.DESKTOP_480_MSVC2010 suitableKits |= Targets.DESKTOP_480_MSVC2010
checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits) checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits)