From d1c8c5ded375bb5b75598e4dd8d399cfa695514b Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 8 Sep 2016 15:53:22 +0200 Subject: [PATCH] Squish: Disable gcc compile check on OSX Change-Id: I6537bb9e20c9d16689cea520a01b28da8f2ed468 Reviewed-by: Robert Loehning --- tests/system/suite_APTW/tst_APTW03/test.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index 3ed4a06d111..36053d2709a 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/tests/system/suite_APTW/tst_APTW03/test.py @@ -85,9 +85,9 @@ def main(): target=targets) virtualFunctionsAdded = False for kit, config in iterateBuildConfigs(len(checkedTargets), "Debug"): + is480Kit = "480" in Targets.getStringForTarget(checkedTargets[kit]) verifyBuildConfig(len(checkedTargets), kit, config, True, True) - if (virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') - and "480" in Targets.getStringForTarget(checkedTargets[kit])): + if virtualFunctionsAdded and platform.system() in ('Microsoft', 'Windows') and is480Kit: test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.") continue invokeMenuItem('Build', 'Build Project "%s"' % projectName) @@ -125,12 +125,14 @@ def main(): addReturn(editor, "QObject \*%s::create.*" % className, "0") virtualFunctionsAdded = True invokeMenuItem('File', 'Save All') - if (platform.system() in ('Microsoft', 'Windows') # QTCREATORBUG-12251 - and "480" in Targets.getStringForTarget(checkedTargets[kit])): + if platform.system() in ('Microsoft', 'Windows') and is480Kit: # QTCREATORBUG-12251 test.warning("Skipping building of Qt4.8 targets because of QTCREATORBUG-12251.") continue invokeMenuItem('Build', 'Rebuild Project "%s"' % projectName) 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() invokeMenuItem("File", "Exit")