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

Squish: Disable gcc compile check on OSX

Browse Source 
Change-Id: I6537bb9e20c9d16689cea520a01b28da8f2ed468
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
This commit is contained in:
Christian Stenger
2016-09-08 15:53:22 +02:00
parent 47ede6dc42
commit d1c8c5ded3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/system/suite_APTW/tst_APTW03/test.py
View File

@@ -85,9 +85,9 @@ def main():
target=targets) target=targets)
virtualFunctionsAdded = False virtualFunctionsAdded = False
for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"): for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"):
is480Kit = "480" in Targets.getStringForTarget(checkedTargets[kit])
verifyBuildConfig(len(checkedTargets), kit, config, True, True) verifyBuildConfig(len(checkedTargets), kit, config, True, True)
if (virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') if virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') and is480Kit:
and "480" in Targets.getStringForTarget(checkedTargets[kit])):
test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.") test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.")
continue continue
invokeMenuItem('Build', 'Build Project "%s"' % projectName) invokeMenuItem('Build', 'Build Project "%s"' % projectName)
@@ -125,12 +125,14 @@ def main():
addReturn(editor, "QObject \*%s::create.*" % className, "0") addReturn(editor, "QObject \*%s::create.*" % className, "0")
virtualFunctionsAdded = True virtualFunctionsAdded = True
invokeMenuItem('File', 'Save All') invokeMenuItem('File', 'Save All')
if (platform.system() in ('Microsoft', 'Windows') # QTCREATORBUG-12251 if platform.system() in ('Microsoft', 'Windows') and is480Kit: # QTCREATORBUG-12251
and "480" in Targets.getStringForTarget(checkedTargets[kit])):
test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.") test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.")
continue continue
invokeMenuItem('Build', 'Rebuild Project "%s"' % projectName) invokeMenuItem('Build', 'Rebuild Project "%s"' % projectName)
waitForCompile(10000) waitForCompile(10000)
if platform.system() == "Darwin" and is480Kit:
test.log("Skipping compile check (gcc on OSX is only clang with gcc frontend nowadays)")
continue
checkCompile() checkCompile()
invokeMenuItem("File", "Exit") invokeMenuItem("File", "Exit")