[Test-Suite] Fix all the sanitizer tests to be based on compiler capabilities

[beanz]

Summary

This patch reworks all the @skip... lines for sanitizer libraries to be based on whether or not the compiler actually works, rather than whether or not the compiler-rt sources are present in some magically derived directory.

[tfiala]

Looks fine to me pending that one question on the TSAN check (i.e. if the existing TSAN check is as good as your new ASAN check, LGTM).

packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py

23

Seems fine as long as @skipUnlessThreadSanitizer is doing the right type of check like you added for @skipUnlessAddressSanitizer.

[beanz]

packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py

23

The implementation of skipUnlessAddressSanitizer is basically copy-paste-simplify-modify of skipUnlessThreadSanitizer. They should both have good coverage.

packages/Python/lldbsuite/test/decorators.py

def skipIfTargetAndroid(api_levels=None, archs=None):
     """
     return skipTestIfFn(
         _skip_for_android(
             "skipping for android",
             api_levels,
             archs))
 
 
-def skipUnlessCompilerRt(func):
-    """Decorate the item to skip tests if testing remotely."""
-    def is_compiler_rt_missing():
-        compilerRtPath = os.path.join(
-            os.environ["LLDB_SRC"],
-            "..",
-            "..",
-            "..",
-            "llvm",
-            "projects",
-            "compiler-rt")
-        if not os.path.exists(compilerRtPath):
-            compilerRtPath = os.path.join(
-            os.environ["LLDB_SRC"],
-            "..",
-            "..",
-            "..",
-            "llvm",
-            "runtimes",
-            "compiler-rt")
-        return "compiler-rt not found" if not os.path.exists(
-            compilerRtPath) else None
-    return skipTestIfFn(is_compiler_rt_missing)(func)
-
-
 def skipUnlessThreadSanitizer(func):
     """Decorate the item to skip test unless Clang -fsanitize=thread is supported."""
 
     def is_compiler_clang_with_thread_sanitizer(self):
         compiler_path = self.getCompiler()
         compiler = os.path.basename(compiler_path)
         if not compiler.startswith("clang"):
             return "Test requires clang as compiler"
         # rdar://28659145 - TSAN tests don't look like they're supported on i386
         if self.getArchitecture() == 'i386' and platform.system() == 'Darwin':
             return "TSAN tests not compatible with i386 targets"
         f = tempfile.NamedTemporaryFile()
         cmd = "echo 'int main() {}' | %s -x c -o %s -" % (compiler_path, f.name)
         if os.popen(cmd).close() is not None:
             return None  # The compiler cannot compile at all, let's *not* skip the test
         cmd = "echo 'int main() {}' | %s -fsanitize=thread -x c -o %s -" % (compiler_path, f.name)
         if os.popen(cmd).close() is not None:
             return "Compiler cannot compile with -fsanitize=thread"
         return None
     return skipTestIfFn(is_compiler_clang_with_thread_sanitizer)(func)
+
+def skipUnlessAddressSanitizer(func):
+    """Decorate the item to skip test unless Clang -fsanitize=thread is supported."""
+
+    def is_compiler_with_address_sanitizer(self):
+        compiler_path = self.getCompiler()
+        compiler = os.path.basename(compiler_path)
+        f = tempfile.NamedTemporaryFile()
+        cmd = "echo 'int main() {}' | %s -x c -o %s -" % (compiler_path, f.name)
+        if os.popen(cmd).close() is not None:
+            return None  # The compiler cannot compile at all, let's *not* skip the test
+        cmd = "echo 'int main() {}' | %s -fsanitize=address -x c -o %s -" % (compiler_path, f.name)
+        if os.popen(cmd).close() is not None:
+            return "Compiler cannot compile with -fsanitize=address"
+        return None
+    return skipTestIfFn(is_compiler_clang_with_thread_sanitizer)(func)

packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py

class AsanTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
+    @skipUnlessAddressSanitizer
     def test(self):
         self.build()
         self.asan_tests()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         self.line_malloc = line_number('main.c', '// malloc line')

packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py

class AsanTestReportDataCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
+    @skipUnlessAddressSanitizer
     @expectedFailureAll(archs=['i386'], bugnumber="rdar://28658860")
     def test(self):
         self.build()
         self.asan_tests()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py

class TsanBasicTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
     @skipUnlessThreadSanitizer
     def test(self):
         self.build()
         self.tsan_tests()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         self.line_malloc = line_number('main.c', '// malloc line')

packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py

class TsanCPPGlobalLocationTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
     @skipUnlessThreadSanitizer
     def test(self):
         self.build()
         self.tsan_tests()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

packages/Python/lldbsuite/test/functionalities/tsan/global_location/TestTsanGlobalLocation.py

class TsanGlobalLocationTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
     @skipUnlessThreadSanitizer
     def test(self):
         self.build()
         self.tsan_tests()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

packages/Python/lldbsuite/test/functionalities/tsan/multiple/TestTsanMultiple.py

class TsanMultipleTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
     @skipUnlessThreadSanitizer
     def test(self):
         self.build()
         self.tsan_tests()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)

packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/TestTsanThreadLeak.py

class TsanThreadLeakTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
     @skipUnlessThreadSanitizer
     def test(self):
         self.build()
         self.tsan_tests()
 
     def tsan_tests(self):
         exe = os.path.join(os.getcwd(), "a.out")
         self.expect(

packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py

class TsanThreadNumbersTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
     @expectedFailureAll(
         oslist=["linux"],
         bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
     @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
-    @skipUnlessCompilerRt
     @skipUnlessThreadSanitizer
     def test(self):
         self.build()
         self.tsan_tests()
 
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)