Index: test/functionalities/asan/TestMemoryHistory.py =================================================================== --- test/functionalities/asan/TestMemoryHistory.py +++ test/functionalities/asan/TestMemoryHistory.py @@ -17,6 +17,7 @@ # self.useBuiltClang() to use clang from the llvm-build directory instead @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @unittest2.skipIf(sys.platform.startswith("darwin"), "-fsanitize=address isn't supported on Darwin") @skipIfRemote @dsym_test def test_with_dsym (self): @@ -24,6 +25,7 @@ self.buildDsym (None, compiler) self.asan_tests () + @unittest2.skipIf(sys.platform.startswith("darwin"), "-fsanitize=address isn't supported on Darwin") @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote @expectedFailureLinux # non-core functionality, need to reenable and fix later (DES 2014.11.07) Index: test/functionalities/asan/TestReportData.py =================================================================== --- test/functionalities/asan/TestReportData.py +++ test/functionalities/asan/TestReportData.py @@ -18,6 +18,7 @@ # self.useBuiltClang() to use clang from the llvm-build directory instead @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") + @unittest2.skipIf(sys.platform.startswith("darwin"), "-fsanitize=address isn't supported on Darwin") @skipIfRemote @dsym_test def test_with_dsym (self): @@ -25,6 +26,7 @@ self.buildDsym (None, compiler) self.asan_tests () + @unittest2.skipIf(sys.platform.startswith("darwin"), "-fsanitize=address isn't supported on Darwin") @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote @expectedFailureLinux # non-core functionality, need to reenable and fix later (DES 2014.11.07) Index: test/lldbtest.py =================================================================== --- test/lldbtest.py +++ test/lldbtest.py @@ -1522,6 +1522,11 @@ path = os.path.join(lldb_root_path, p) if os.path.exists(path): return path + + # Tries to find clang at the same folder as the lldb + path = os.path.join(os.path.dirname(self.lldbExec), "clang") + if os.path.exists(path): + return path return os.environ["CC"]