diff --git a/tests/system/README b/tests/system/README index 65adf14daac..bf855921b18 100644 --- a/tests/system/README +++ b/tests/system/README @@ -11,8 +11,8 @@ On Linux/Mac this is ~/QtSDK, and on Windows this is C:\QtSDK. After installing the QtSDK you should use the package manager of the QtSDK (SDKMaintenanceTool) to add some more packages. You'll need at least Desktop Qt versions 4.7.4, 4.8.0, Harmattan stuff (except QEmu), Maemo Toolchain, Qt Examples, Simulator, Documentation files. -Third - some of the test suites/test cases expect Qt 5.0.1 installed in its default location. -On Linux/Mac this is ~/Qt5.0.1, and on Windows this is C:\Qt\Qt5.0.1. +Third - some of the test suites/test cases expect Qt 5.0.1 and Qt 5.2.1 installed in its default location. +On Linux/Mac this is ~/Qt5.0.1 or ~/Qt5.2.1, and on Windows this is C:\Qt\Qt5.0.1 or C:\Qt\Qt5.2.1. Fourth - you'll have to provide some additional repositories (and for the hooking into subprocesses even some more Squish bundles, see below). These additional repositories are located inside ~/QtSDK/src or C:\QtSDK\src (depending on the OS you're on). diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index a4dc009fa4a..46b4f975986 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -41,10 +41,12 @@ class Targets: EMBEDDED_LINUX = 32 DESKTOP_480_MSVC2010 = 64 DESKTOP_501_DEFAULT = 128 + DESKTOP_521_DEFAULT = 256 @staticmethod def desktopTargetClasses(): - desktopTargets = Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC | Targets.DESKTOP_501_DEFAULT + desktopTargets = (Targets.DESKTOP_474_GCC | Targets.DESKTOP_480_GCC + | Targets.DESKTOP_501_DEFAULT | Targets.DESKTOP_521_DEFAULT) if platform.system() in ('Windows', 'Microsoft'): desktopTargets |= Targets.DESKTOP_480_MSVC2010 return desktopTargets @@ -67,6 +69,8 @@ class Targets: return "Desktop 480 MSVC2010" elif target == Targets.DESKTOP_501_DEFAULT: return "Desktop 501 default" + elif target == Targets.DESKTOP_521_DEFAULT: + return "Desktop 521 default" else: return None @@ -84,7 +88,7 @@ class Targets: def intToArray(targets): 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] + Targets.DESKTOP_501_DEFAULT, Targets.DESKTOP_521_DEFAULT] return filter(lambda x: x & targets == x, available) @staticmethod diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 17c0e30ad61..950482bfaca 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -358,7 +358,8 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None): else: # following targets depend on the build environment - added for further/later tests available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.DESKTOP_501_DEFAULT, - Targets.MAEMO5, Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN] + Targets.DESKTOP_521_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) @@ -559,7 +560,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): result.append(Targets.EMBEDDED_LINUX) elif platform.system() in ('Windows', 'Microsoft'): result.append(Targets.DESKTOP_480_MSVC2010) - result.append(Targets.DESKTOP_501_DEFAULT) + result.extend([Targets.DESKTOP_501_DEFAULT, Targets.DESKTOP_521_DEFAULT]) if 'MeeGo/Harmattan' in supports: result.append(Targets.HARMATTAN) if 'Maemo/Fremantle' in supports: @@ -569,7 +570,7 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): 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_GCC, Targets.DESKTOP_501_DEFAULT, - Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN] + Targets.DESKTOP_521_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_qtquick/tst_qtquick_creation/test.py b/tests/system/suite_qtquick/tst_qtquick_creation/test.py index f64e978bc4f..7f94684c8ae 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py @@ -33,8 +33,8 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - # TODO provide Qt5.2/Qt5.1 to enable QtQuick2 testing - for targ, qVer in {Targets.DESKTOP_480_GCC:"1.1"}.items(): # Targets.DESKTOP_501_DEFAULT:2}.items(): + for targ, qVer in [[Targets.DESKTOP_480_GCC, "1.1"], [Targets.DESKTOP_521_DEFAULT, "2.1"], + [Targets.DESKTOP_521_DEFAULT, "2.2"]]: # using a temporary directory won't mess up a potentially existing workingDir = tempDir() checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targ, diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py index ce4397192af..ff24f7e179b 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py @@ -33,7 +33,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - for quickVersion in ["1.1"]:#, "2.1", "2.2"]: # TODO add Qt5.2 and/or Qt5.1 kit to enable these + for quickVersion in ["1.1", "2.1", "2.2"]: # using a temporary directory won't mess up a potentially existing workingDir = tempDir() projectName = createNewQtQuickUI(workingDir, quickVersion) diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py index d9ee75ee9a4..36b328d4493 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py @@ -33,7 +33,8 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - for targ, quickVer in {Targets.DESKTOP_480_GCC:1, Targets.DESKTOP_501_DEFAULT:2}.items(): + for targ, quickVer in [[Targets.DESKTOP_480_GCC, 1], [Targets.DESKTOP_501_DEFAULT, 2], + [Targets.DESKTOP_521_DEFAULT, 2]]: # using a temporary directory won't mess up a potentially existing createNewQmlExtension(tempDir(), targ, quickVer) # wait for parsing to complete