From f0b6a6c16ae9735079cb69d9bcfa9d587194de2a Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 14 Oct 2024 07:52:13 +0200 Subject: [PATCH] SquishTests: Fix default settings check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We nowadays detect either qmake or qmake6 from PATH, so just take the path of the executable without the file name into account as it does not matter for us whether it is qmake or qmake6. Change-Id: Iba521f4c085b56be04fc7d43cd0990a5983950a1 Reviewed-by: Robert Löhning --- tests/system/suite_general/tst_default_settings/test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index 48a5bc46486..c9aaf2edb84 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -68,6 +68,8 @@ def __checkKits__(): getOutputFromCmdline([qmakePath, "--version"], acceptedError=1)): # ignore dysfunctional qmake, e.g. incomplete qtchooser qmakePath = None + if qmakePath: + qmakePath = os.path.dirname(qmakePath) foundQt = [] clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Qt Versions") __iterateTree__(":qtdirList_QTreeView", __qtFunc__, foundQt, qmakePath) @@ -157,7 +159,7 @@ def __qtFunc__(it, foundQt, qmakePath): "Verifying found Qt (%s) is executable." % qtPath) # Two Qt versions will be found when using qtchooser: QTCREATORBUG-14697 # Only add qmake from "which" to list - if qtPath == qmakePath: + if qtPath.startswith(qmakePath): foundQt.append(it) try: errorLabel = findObject(":QtSupport__Internal__QtVersionManager.errorLabel.QLabel")