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

SquishTests: Handle autodetected kits when no qmake was found

Browse Source 
Small code cleanups along the way.

Change-Id: If2f3a5ad7f8f7fe7fc550f044929bfe8768175ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Löhning
2024-08-19 22:03:31 +02:00
parent e92a8402a8
commit 97648298f3
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/system/suite_general/tst_default_settings/test.py
View File

@@ -29,8 +29,11 @@ def __createMinimumIni__(emptyParent):
iniFile.write("OverrideLanguage=C\n") iniFile.write("OverrideLanguage=C\n")
iniFile.close() iniFile.close()
glblDefaultKits = 0
def __checkKits__(): def __checkKits__():
global genericDebuggers
mouseClick(waitForObjectItem(":Options_QListView", "Kits")) mouseClick(waitForObjectItem(":Options_QListView", "Kits"))
# check compilers # check compilers
expectedCompilers = __getExpectedCompilers__() expectedCompilers = __getExpectedCompilers__()
@@ -75,6 +78,7 @@ def __checkKits__():
# check kits # check kits
clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Kits") clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Kits")
__iterateTree__(":BuildAndRun_QTreeView", __kitFunc__, foundQt, foundCompilerNames) __iterateTree__(":BuildAndRun_QTreeView", __kitFunc__, foundQt, foundCompilerNames)
test.compare(glblDefaultKits, 1, "Was exactly one default kit found?")
return qmakePath != None return qmakePath != None
def __processSubItems__(treeObjStr, section, parModelIndexStr, doneItems, def __processSubItems__(treeObjStr, section, parModelIndexStr, doneItems,
@@ -161,19 +165,31 @@ def __qtFunc__(it, foundQt, qmakePath):
except: except:
pass pass
glblUsedKitNames = set()
def __kitFunc__(it, foundQt, foundCompNames): def __kitFunc__(it, foundQt, foundCompNames):
global currentSelectedTreeItem, warningOrError global currentSelectedTreeItem, warningOrError
if 'Python' in it: # skip Python kits if 'Python' in it: # skip Python kits
return return
qtVersionStr = str(waitForObjectExists(":Kits_QtVersion_QComboBox").currentText) defaultKitSuffix = " (default)"
# The following may fail if Creator doesn't find a Qt version in PATH. It will then create one if it.endswith(defaultKitSuffix):
# Qt-less kit for each available toolchain instead of just one default Desktop kit. global glblDefaultKits
# Since Qt usually is in PATH on the test machines anyway, we consider this too much of a glblDefaultKits += 1
# corner case to add error handling code or make Qt in PATH a hard requirement for the tests.
test.compare(it, "Desktop (default)", "Verifying whether default Desktop kit has been created.")
if foundQt: if foundQt:
test.compare(it, "Desktop" + defaultKitSuffix,
"Verifying whether default Desktop kit has been created.")
qtVersionStr = str(waitForObjectExists(":Kits_QtVersion_QComboBox").currentText)
test.compare(qtVersionStr, foundQt, "Verifying if Qt versions match.") test.compare(qtVersionStr, foundQt, "Verifying if Qt versions match.")
else:
# Creator creates one kit for each compiler's ABI
global glblUsedKitNames
kitName = it.removesuffix(defaultKitSuffix)
test.verify(kitName not in glblUsedKitNames,
"The kit name '%s' was not used before?" % kitName)
glblUsedKitNames.add(kitName)
compilerCombo = findObject(":Compiler:_QComboBox") compilerCombo = findObject(":Compiler:_QComboBox")
test.compare(compilerCombo.enabled, compilerCombo.count > 1, test.compare(compilerCombo.enabled, compilerCombo.count > 1,
"Verifying whether compiler combo is enabled/disabled correctly.") "Verifying whether compiler combo is enabled/disabled correctly.")