aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2018-04-16 15:49:31 +0200
committerChristian Stenger <christian.stenger@qt.io>2018-04-17 04:55:48 +0000
commit87710540603ca2f26aa7956229c848c0f63148d7 (patch)
tree474a31204cb1ccab7ffbf20a11a50e43b891869e /tests
parentfdc4ac41d92a97ed31bb9c3297ceb9f7cae1c748 (diff)
Squish: Check also for expected clang on macOS
Change-Id: I32d7f5ebf02a559ca854553536874c6ec68f0ec5 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/system/suite_general/tst_default_settings/test.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py
index a4230fe17f..088d7246f6 100644
--- a/tests/system/suite_general/tst_default_settings/test.py
+++ b/tests/system/suite_general/tst_default_settings/test.py
@@ -188,9 +188,10 @@ def __getExpectedCompilers__():
compilers.extend(findAllFilesInPATH("*g++*"))
compilers.extend(findAllFilesInPATH("*gcc*"))
if platform.system() == 'Darwin':
- xcodeClang = getOutputFromCmdline(["xcrun", "--find", "clang++"]).strip("\n")
- if xcodeClang and os.path.exists(xcodeClang) and xcodeClang not in expected:
- expected.append(xcodeClang)
+ for compilerExe in ('clang++', 'clang'):
+ xcodeClang = getOutputFromCmdline(["xcrun", "--find", compilerExe]).strip("\n")
+ if xcodeClang and os.path.exists(xcodeClang) and xcodeClang not in expected:
+ expected.append(xcodeClang)
for compiler in compilers:
compilerPath = which(compiler)
if compilerPath: