From 87710540603ca2f26aa7956229c848c0f63148d7 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 16 Apr 2018 15:49:31 +0200 Subject: [PATCH] Squish: Check also for expected clang on macOS Change-Id: I32d7f5ebf02a559ca854553536874c6ec68f0ec5 Reviewed-by: Robert Loehning --- tests/system/suite_general/tst_default_settings/test.py | 7 ++++--- 1 file 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 a4230fe17fa..088d7246f6c 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: