From 650d8710cb6a22b0c9c3307a14fa15fdc199be39 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 4 Feb 2014 09:26:29 +0100 Subject: [PATCH] Squish: Do not rely on default installation path Change-Id: Iac5d45b3cbdb5ecb18d971b37189b27164abbaf3 Reviewed-by: Robert Loehning --- tests/system/suite_general/tst_default_settings/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index cc30717354a..635c1559313 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -217,8 +217,8 @@ def __getExpectedDebuggers__(): debuggers = ["gdb", "lldb"] result.extend(filter(None, map(which, debuggers))) if platform.system() == 'Darwin': - xcodeLLDB = "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb" - if os.path.exists(xcodeLLDB): + xcodeLLDB = getOutputFromCmdline("xcrun --find lldb").strip("\n") + if xcodeLLDB and os.path.exists(xcodeLLDB) and xcodeLLDB not in result: result.append(xcodeLLDB) return result