diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2016-09-08 15:53:22 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2016-09-27 04:43:17 +0000 |
| commit | d1c8c5ded375bb5b75598e4dd8d399cfa695514b (patch) | |
| tree | 3811c2ae43d8210c8080f4050b34eaa22489135f /tests | |
| parent | 47ede6dc4244f30a08d8b5a04c9b34aea186aa59 (diff) | |
| download | qt-creator-d1c8c5ded375bb5b75598e4dd8d399cfa695514b.tar.gz | |
Squish: Disable gcc compile check on OSX
Change-Id: I6537bb9e20c9d16689cea520a01b28da8f2ed468
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/system/suite_APTW/tst_APTW03/test.py | 10 |
1 files 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 3ed4a06d11..36053d2709 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") |