From 0604027834b04df7407785715741fe958762f49b Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 22 Feb 2023 14:40:41 +0100
Subject: [PATCH] SquishTests: Fix path handling for pre-installed Qts

There is now a Qt6 and a new possible location.

Change-Id: I4feac6da2756bde77e98ce08f945ddefec7e2fb4
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 tests/system/shared/classes.py | 52 +++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index 49026fa425d..dcc702295b4 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -21,6 +21,10 @@ class Targets:
                                      "Desktop 5.14.1 default",
                                      "Desktop 6.2.4"]))
 
+    @staticmethod
+    def isOnlineInstaller(target):
+        return target == Targets.DESKTOP_6_2_4
+
     @staticmethod
     def availableTargetClasses(ignoreValidity=False):
         availableTargets = set(Targets.ALL_TARGETS)
@@ -81,13 +85,14 @@ class QtPath:
 
     @staticmethod
     def getPaths(pathSpec):
-        qt5targets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT]
+        qtTargets = [Targets.DESKTOP_5_10_1_DEFAULT, Targets.DESKTOP_5_14_1_DEFAULT,
+                     Targets.DESKTOP_6_2_4]
         if platform.system() != 'Darwin':
-            qt5targets.append(Targets.DESKTOP_5_4_1_GCC)
+            qtTargets.append(Targets.DESKTOP_5_4_1_GCC)
         if pathSpec == QtPath.DOCS:
-            return map(lambda target: QtPath.docsPath(target), qt5targets)
+            return map(lambda target: QtPath.docsPath(target), qtTargets)
         elif pathSpec == QtPath.EXAMPLES:
-            return map(lambda target: QtPath.examplesPath(target), qt5targets)
+            return map(lambda target: QtPath.examplesPath(target), qtTargets)
         else:
             test.fatal("Unknown pathSpec given: %s" % str(pathSpec))
             return []
@@ -97,9 +102,9 @@ class QtPath:
         if target not in Targets.ALL_TARGETS:
             raise Exception("Unexpected target '%s'" % str(target))
 
-        matcher = re.match("^Desktop (5\.\\d{1,2}\.\\d{1,2}).*$", Targets.getStringForTarget(target))
+        matcher = re.match("^Desktop ([56]\.\\d{1,2}\.\\d{1,2}).*$", Targets.getStringForTarget(target))
         if matcher is None:
-            raise Exception("Currently this is supported for Desktop Qt5 only, got target '%s'"
+            raise Exception("Currently this is supported for Desktop Qt5/Qt6 only, got target '%s'"
                             % str(Targets.getStringForTarget(target)))
         return matcher.group(1)
 
@@ -110,34 +115,49 @@ class QtPath:
         else:
             return os.path.expanduser("~/Qt5.%d.1" % qt5Minor)
 
+    @staticmethod
+    def __createQtOnlineInstallerPath__():
+        qtBasePath = os.getenv('SYSTEST_QTOI_BASEPATH', None)
+        if qtBasePath is None:
+            qtBasePath = 'C:/Qt' if platform.system() in ('Microsoft', 'Windows') else '~/Qt'
+        qtBasePath = os.path.expanduser(qtBasePath)
+        if not os.path.exists(qtBasePath):
+            test.fatal("Unexpected Qt install path '%s'" % qtBasePath)
+            return ""
+        return qtBasePath
+
     @staticmethod
     def toVersionTuple(versionString):
         return tuple(map(__builtin__.int, versionString.split(".")))
 
     @staticmethod
-    def getQtMinorAndPatchVersion(target):
+    def getQtVersion(target):
         qtVersionStr = QtPath.__preCheckAndExtractQtVersionStr__(target)
         versionTuple = QtPath.toVersionTuple(qtVersionStr)
-        return versionTuple[1], versionTuple[2]
+        return versionTuple
 
     @staticmethod
     def examplesPath(target):
-        qtMinorVersion, qtPatchVersion = QtPath.getQtMinorAndPatchVersion(target)
-        if qtMinorVersion < 10:
-            path = "Examples/Qt-5.%d" % qtMinorVersion
+        qtMajorVersion, qtMinorVersion, qtPatchVersion = QtPath.getQtVersion(target)
+        if qtMajorVersion == 5 and qtMinorVersion < 10:
+            path = "Examples/Qt-%d.%d" % (qtMajorVersion,  qtMinorVersion)
         else:
-            path = "Examples/Qt-5.%d.%d" % (qtMinorVersion, qtPatchVersion)
+            path = "Examples/Qt-%d.%d.%d" % (qtMajorVersion, qtMinorVersion, qtPatchVersion)
 
+        if Targets.isOnlineInstaller(target):
+            return os.path.join(QtPath.__createQtOnlineInstallerPath__(), path)
         return os.path.join(QtPath.__createPlatformQtPath__(qtMinorVersion), path)
 
     @staticmethod
     def docsPath(target):
-        qtMinorVersion, qtPatchVersion = QtPath.getQtMinorAndPatchVersion(target)
-        if qtMinorVersion < 10:
-            path = "Docs/Qt-5.%d" % qtMinorVersion
+        qtMajorVersion, qtMinorVersion, qtPatchVersion = QtPath.getQtVersion(target)
+        if qtMajorVersion == 5 and qtMinorVersion < 10:
+            path = "Docs/Qt-%d.%d" % (qtMajorVersion, qtMinorVersion)
         else:
-            path = "Docs/Qt-5.%d.%d" % (qtMinorVersion, qtPatchVersion)
+            path = "Docs/Qt-%d.%d.%d" % (qtMajorVersion, qtMinorVersion, qtPatchVersion)
 
+        if Targets.isOnlineInstaller(target):
+            return os.path.join(QtPath.__createQtOnlineInstallerPath__(), path)
         return os.path.join(QtPath.__createPlatformQtPath__(qtMinorVersion), path)
 
 class TestSection: