diff --git a/tests/system/settings/windows2022/QtProject/QtCreator.ini b/tests/system/settings/windows2022/QtProject/QtCreator.ini new file mode 100644 index 00000000000..b77fccec036 --- /dev/null +++ b/tests/system/settings/windows2022/QtProject/QtCreator.ini @@ -0,0 +1,2 @@ +[%General] +OverrideLanguage=C diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/debuggers.xml b/tests/system/settings/windows2022/QtProject/qtcreator/debuggers.xml new file mode 100644 index 00000000000..efb946f2bcd --- /dev/null +++ b/tests/system/settings/windows2022/QtProject/qtcreator/debuggers.xml @@ -0,0 +1,28 @@ + + + + + + DebuggerItem.0 + + + x86-windows-msys-pe-unknown + + false + + C:/Qt/Tools/mingw1120_64/bin/gdb.exe + gdb 11.2 + 1 + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} + 11.2.0 + + + + DebuggerItem.Count + 1 + + + Version + 1 + + diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/devices.xml b/tests/system/settings/windows2022/QtProject/qtcreator/devices.xml new file mode 100644 index 00000000000..70eaf23f6b2 --- /dev/null +++ b/tests/system/settings/windows2022/QtProject/qtcreator/devices.xml @@ -0,0 +1,30 @@ + + + + + + DeviceManager + + + Desktop Device + + + + 1 + + + Desktop Device + + Run locally + 1 + Desktop + + 0 + 0 + 0 + + + + + + diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows2022/QtProject/qtcreator/profiles.xml new file mode 100644 index 00000000000..0710f142a7f --- /dev/null +++ b/tests/system/settings/windows2022/QtProject/qtcreator/profiles.xml @@ -0,0 +1,122 @@ + + + + + Profile.0 + + false + + + + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} + Desktop Device + Desktop + + + ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb} + + {777132b1-5d59-4adf-ab0d-3a6df2a0a0fb} + {44d54392-22ee-4eac-a9f1-2d882ba8a7bb} + + + 22 + + :///DESKTOP/// + {10cf33c5-e36d-4a49-a8c7-086f3cf59695} + + Desktop 6.7.3 GCC + false + + + + + Profile.1 + + false + + + + Desktop Device + Desktop + + + + {4580fc7c-8102-4144-a808-749b1a29f739} + {c6590889-1d34-4d12-af47-51ec76305e88} + + + 24 + + :///DESKTOP/// + {f9c7858c-d167-4b78-847a-91943bd0af07} + + Desktop 5.14.1 default + false + + + + + Profile.2 + + false + + + + + Desktop Device + Desktop + + SQUISH_ENV_MODIFICATION + + + + {c96cfaf3-fb8a-472b-b3c7-e94e8c490f17} + {ed856706-2a9d-4745-9d85-4e322b6f91d4} + + + 26 + + + {37fad24d-07f3-442e-8c65-d9ded3633f7e} + + Desktop 5.10.1 default + false + + + + + + Profile.3 + + false + + + Desktop Device + Desktop + + {4580fc7c-8102-4144-a808-749b1a29f739} + {c6590889-1d34-4d12-af47-51ec76305e88} + + 27 + + + + {cec120c5-6455-497b-8059-8e079cbdd5fd} + + Desktop 6.2.4 + false + + + + Profile.Count + 4 + + + Profile.Default + {f9c7858c-d167-4b78-847a-91943bd0af07} + + + Version + 1 + + diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows2022/QtProject/qtcreator/qtversion.xml new file mode 100644 index 00000000000..4b913250e65 --- /dev/null +++ b/tests/system/settings/windows2022/QtProject/qtcreator/qtversion.xml @@ -0,0 +1,49 @@ + + + + + + QtVersion.0 + + 22 + Qt %{Qt:Version} (mingw1120_64) + SQUISH_QTOI_BASEPATH/6.7.3/mingw_64/bin/qmake.exe + Qt4ProjectManager.QtVersion.Desktop + false + + + + QtVersion.1 + + 24 + Qt %{Qt:Version} (msvc2017_64) + C:/Qt/Qt5.14.1/5.14.1/msvc2017_64/bin/qmake.exe + Qt4ProjectManager.QtVersion.Desktop + false + + + + QtVersion.2 + + 26 + Qt %{Qt:Version} (msvc2015) + C:/Qt/Qt5.10.1/5.10.1/msvc2015/bin/qmake.exe + Qt4ProjectManager.QtVersion.Desktop + false + + + + QtVersion.3 + + 27 + Qt %{Qt:Version} (msvc2019_64) + SQUISH_QTOI_BASEPATH/6.2.4/msvc2019_64/bin/qmake.exe + Qt4ProjectManager.QtVersion.Desktop + false + + + + Version + 1 + + diff --git a/tests/system/settings/windows2022/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows2022/QtProject/qtcreator/toolchains.xml new file mode 100644 index 00000000000..8d0a277a982 --- /dev/null +++ b/tests/system/settings/windows2022/QtProject/qtcreator/toolchains.xml @@ -0,0 +1,121 @@ + + + + + + ToolChain.0 + + C:/Qt/Tools/mingw1120_64/bin/g++.exe + + + + x86-windows-msys-pe-64bit + + x86-windows-msys-pe-64bit + false + MinGW 11.20 + ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb} + + + + ToolChain.1 + + i686-w64-mingw64 + C:/Qt/Tools/mingw1120_64/bin/gcc.exe + + + + x86-windows-msys-pe-64bit + + x86-windows-msys-pe-64bit + false + MinGW 11.20 + ProjectExplorer.ToolChain.Mingw:{777132b1-5d59-4adf-ab0d-3a6df2a0a0fb} + 1 + + + + ToolChain.2 + + x86-windows-msvc2022-pe-64bit + C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat + amd64 + + + PATH + 0 + SQUISH_MSVC2022_64_PATH + + + MSVC2022 (amd64) + ProjectExplorer.ToolChain.Msvc:{4580fc7c-8102-4144-a808-749b1a29f739} + 1 + C + + + + ToolChain.3 + + x86-windows-msvc2022-pe-64bit + C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat + amd64 + + + PATH + 0 + SQUISH_MSVC2022_64_PATH + + + MSVC2022 (amd64) + ProjectExplorer.ToolChain.Msvc:{c6590889-1d34-4d12-af47-51ec76305e88} + 2 + Cxx + + + + ToolChain.4 + + x86-windows-msvc2022-pe-32bit + C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat + x86 + + + PATH + 0 + SQUISH_MSVC2022_32_PATH + + + MSVC2022 (x86) + ProjectExplorer.ToolChain.Msvc:{c96cfaf3-fb8a-472b-b3c7-e94e8c490f17} + 1 + C + + + + ToolChain.5 + + x86-windows-msvc2022-pe-32bit + C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvarsall.bat + x86 + + + PATH + 0 + SQUISH_MSVC2022_32_PATH + + + MSVC2022 (x86) + ProjectExplorer.ToolChain.Msvc:{ed856706-2a9d-4745-9d85-4e322b6f91d4} + 2 + Cxx + + + + ToolChain.Count + 6 + + + Version + 1 + + diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 4659dda5535..755234eacd5 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -7,16 +7,28 @@ import builtins class Targets: ALL_TARGETS = tuple(range(4)) - (DESKTOP_5_4_1_GCC, - DESKTOP_5_10_1_DEFAULT, - DESKTOP_5_14_1_DEFAULT, - DESKTOP_6_2_4) = ALL_TARGETS + if os.getenv("SYSTEST_NEW_SETTINGS") != "1": + (DESKTOP_5_4_1_GCC, + DESKTOP_5_10_1_DEFAULT, + DESKTOP_5_14_1_DEFAULT, + DESKTOP_6_2_4) = ALL_TARGETS - __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS, - ["Desktop 5.4.1 GCC", - "Desktop 5.10.1 default", - "Desktop 5.14.1 default", - "Desktop 6.2.4"])) + __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS, + ["Desktop 5.4.1 GCC", + "Desktop 5.10.1 default", + "Desktop 5.14.1 default", + "Desktop 6.2.4"])) + else: + (DESKTOP_6_7_3_GCC, + DESKTOP_5_10_1_DEFAULT, + DESKTOP_5_14_1_DEFAULT, + DESKTOP_6_2_4) = ALL_TARGETS + + __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS, + ["Desktop 6.7.3 GCC", + "Desktop 5.10.1 default", + "Desktop 5.14.1 default", + "Desktop 6.2.4"])) @staticmethod def isOnlineInstaller(target): @@ -26,7 +38,10 @@ class Targets: def availableTargetClasses(ignoreValidity=False): availableTargets = set(Targets.ALL_TARGETS) if platform.system() not in ('Windows', 'Microsoft'): - availableTargets.remove(Targets.DESKTOP_5_4_1_GCC) + if os.getenv("SYSTEST_NEW_SETTINGS") == "1": + availableTargets.remove(Targets.DESKTOP_6_7_3_GCC) + else: + availableTargets.remove(Targets.DESKTOP_5_4_1_GCC) return availableTargets @staticmethod @@ -85,7 +100,10 @@ class QtPath: qtTargets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT, Targets.DESKTOP_6_2_4] if platform.system() in ('Windows', 'Microsoft'): - qtTargets.append(Targets.DESKTOP_5_4_1_GCC) + if os.getenv("SYSTEST_NEW_SETTINGS") == "1": + qtTargets.append(Targets.DESKTOP_6_7_3_GCC) + else: + qtTargets.append(Targets.DESKTOP_5_4_1_GCC) if pathSpec == QtPath.DOCS: return map(lambda target: QtPath.docsPath(target), qtTargets) elif pathSpec == QtPath.EXAMPLES: diff --git a/tests/system/shared/debugger.py b/tests/system/shared/debugger.py index 17f357881b2..e49e2e5df2d 100644 --- a/tests/system/shared/debugger.py +++ b/tests/system/shared/debugger.py @@ -179,7 +179,7 @@ def isMsvcConfig(currentKit): index = waitForObject(wantedKitIndexString) toolTip = str(index.data(Qt.ToolTipRole).toString()) compilerPattern = re.compile('
Compiler:
(?P.+)' - '
Environment:') + '
Debugger:') match = compilerPattern.search(toolTip) if match is None: test.warning("UI seems to have changed - failed to check for compiler.") diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index acf2bc1d7da..fa2567f2c05 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -534,7 +534,10 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False, ignoreVali Targets.DESKTOP_5_14_1_DEFAULT, Targets.DESKTOP_6_2_4])) if platform.system() in ('Windows', 'Microsoft'): - result.add(Targets.DESKTOP_5_4_1_GCC) + if os.getenv('SYSTEST_NEW_SETTINGS') == '1': + result.add(Targets.DESKTOP_6_7_3_GCC) + else: + result.add(Targets.DESKTOP_5_4_1_GCC) elif 'Platform independent' in text: result = Targets.desktopTargetClasses() else: diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py index 12d6fc364b8..80c41cb14e1 100644 --- a/tests/system/shared/qtcreator.py +++ b/tests/system/shared/qtcreator.py @@ -203,15 +203,16 @@ def substituteDefaultCompiler(settingsDir): def substituteMsvcPaths(settingsDir, version, targetBitness=64): - if not version in ['2017', '2019']: + if not version in ['2017', '2019', '2022']: test.fatal('Unexpected MSVC version - "%s" not implemented yet.' % version) return hostArch = "Hostx64" if targetBitness == 64 else "Hostx86" targetArch = "x64" if targetBitness == 64 else "x86" + baseFolder = "C:\\Program Files" if version == "2022" else "C:\\Program Files (x86)" for msvcFlavor in ["Community", "BuildTools"]: try: - msvcPath = os.path.join("C:\\Program Files (x86)", "Microsoft Visual Studio", + msvcPath = os.path.join(baseFolder, "Microsoft Visual Studio", version, msvcFlavor, "VC", "Tools", "MSVC") foundVersions = os.listdir(msvcPath) # undetermined order foundVersions.sort(reverse=True) # we explicitly want the latest and greatest @@ -273,9 +274,13 @@ def copySettingsToTmpDir(destination=None, omitFiles=[]): substituteTildeWithinQtVersion(tmpSettingsDir) substituteDefaultCompiler(tmpSettingsDir) elif platform.system() in ('Windows', 'Microsoft'): - substituteMsvcPaths(tmpSettingsDir, '2017', 64) - substituteMsvcPaths(tmpSettingsDir, '2017', 32) - substituteMsvcPaths(tmpSettingsDir, '2019', 64) + if os.getenv('SYSTEST_NEW_SETTINGS') == '1': + substituteMsvcPaths(tmpSettingsDir, '2022', 32) + substituteMsvcPaths(tmpSettingsDir, '2022', 64) + else: + substituteMsvcPaths(tmpSettingsDir, '2017', 64) + substituteMsvcPaths(tmpSettingsDir, '2017', 32) + substituteMsvcPaths(tmpSettingsDir, '2019', 64) prependWindowsKit(tmpSettingsDir, 32) substituteOnlineInstallerPath(tmpSettingsDir) SettingsPath = ['-settingspath', '"%s"' % tmpSettingsDir] @@ -285,7 +290,10 @@ test.log("Test is running on Python %s" % sys.version) origSettingsDir = os.path.abspath(os.path.join(os.getcwd(), "..", "..", "settings")) if platform.system() in ('Windows', 'Microsoft'): - origSettingsDir = os.path.join(origSettingsDir, "windows") + if os.getenv("SYSTEST_NEW_SETTINGS") == "1": + origSettingsDir = os.path.join(origSettingsDir, "windows2022") + else: + origSettingsDir = os.path.join(origSettingsDir, "windows") elif platform.system() == 'Darwin': origSettingsDir = os.path.join(origSettingsDir, "mac") else: diff --git a/tests/system/suite_APTW/tst_APTW01/test.py b/tests/system/suite_APTW/tst_APTW01/test.py index f1536b2a874..110d6bba43e 100644 --- a/tests/system/suite_APTW/tst_APTW01/test.py +++ b/tests/system/suite_APTW/tst_APTW01/test.py @@ -13,7 +13,9 @@ def main(): # run project for debug and release and verify results expectToFail = None if platform.system() in ('Microsoft', 'Windows'): - expectToFail = [Targets.DESKTOP_5_4_1_GCC] + expectToFail = [Targets.DESKTOP_5_10_1_DEFAULT] # fails to handle constexpr correctly + if os.getenv('SYSTEST_NEW_SETTINGS') != '1': + expectToFail.append(Targets.DESKTOP_5_4_1_GCC) runVerify(expectToFail) #close Qt Creator invokeMenuItem("File", "Exit") diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index 1168ca94a50..65913db05e4 100644 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -17,9 +17,12 @@ def main(): startQC() if not startedWithoutPluginError(): return - # open example project, supports only Qt 5 + # open example project targets = Targets.desktopTargetClasses() - targets.discard(Targets.DESKTOP_5_4_1_GCC) + if os.getenv('SYSTEST_NEW_SETTINGS') != '1': + targets.discard(Targets.DESKTOP_5_4_1_GCC) + targets.discard(Targets.DESKTOP_5_10_1_DEFAULT) # fails to handle constexpr correctly + openQmakeProject(examplePath, targets) # build and wait until finished - on all build configurations availableConfigs = iterateBuildConfigs() diff --git a/tests/system/suite_debugger/tst_build_new_project/test.py b/tests/system/suite_debugger/tst_build_new_project/test.py index b29678ffcf6..c4b521fec1f 100644 --- a/tests/system/suite_debugger/tst_build_new_project/test.py +++ b/tests/system/suite_debugger/tst_build_new_project/test.py @@ -17,7 +17,8 @@ def main(): expectConfigureToFail = [] expectBuildToFail = [] if platform.system() in ('Microsoft', 'Windows'): - expectConfigureToFail = [ Targets.DESKTOP_5_4_1_GCC ] # gcc 4.9 does not know C++17 + if os.getenv('SYSTEST_NEW_SETTINGS') != '1': + expectConfigureToFail = [ Targets.DESKTOP_5_4_1_GCC ] # gcc 4.9 does not know C++17 expectBuildToFail = [ Targets.DESKTOP_5_10_1_DEFAULT ] # fails to handle constexpr correctly for kit, config in availableConfigs: diff --git a/tests/system/suite_debugger/tst_cli_output_console/test.py b/tests/system/suite_debugger/tst_cli_output_console/test.py index aed9089fed9..1d6d7259926 100644 --- a/tests/system/suite_debugger/tst_cli_output_console/test.py +++ b/tests/system/suite_debugger/tst_cli_output_console/test.py @@ -16,6 +16,8 @@ def main(): if platform.system() in ('Microsoft', 'Windows'): # Qt5.10 has constructs that do not work on Win because of limitation to older C++ targets = [Targets.DESKTOP_5_14_1_DEFAULT, Targets.DESKTOP_6_2_4] + if os.getenv('SYSTEST_NEW_SETTINGS') == '1': + targets.append(Targets.DESKTOP_6_7_3_GCC) createProject_Qt_Console(tempDir(), project, targets=targets) mainEditor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget") @@ -56,13 +58,7 @@ def main(): appOutput = str(waitForObject(":Qt Creator_Core::OutputWindow").plainText) verifyOutput(appOutput, outputStdOut, "std::cout", "Application Output") verifyOutput(appOutput, outputStdErr, "std::cerr", "Application Output") - if (kit == Targets.DESKTOP_5_4_1_GCC - and platform.system() in ('Windows', 'Microsoft')): - test.log("Skipping qDebug() from %s (unstable, QTCREATORBUG-15067)" - % Targets.getStringForTarget(Targets.DESKTOP_5_4_1_GCC)) - else: - verifyOutput(appOutput, outputQDebug, - "qDebug()", "Application Output") + verifyOutput(appOutput, outputQDebug, "qDebug()", "Application Output") clickButton(waitForObject(":Qt Creator_CloseButton")) except: test.fatal("Could not find Application Output Window",