[compiler-rt] r252309 - [tsan] Add Darwin support for lit tests

Kuba Brecka via llvm-commits llvm-commits at lists.llvm.org
Fri Nov 6 07:05:34 PST 2015


Author: kuba.brecka
Date: Fri Nov  6 09:05:34 2015
New Revision: 252309

URL: http://llvm.org/viewvc/llvm-project?rev=252309&view=rev
Log:
[tsan] Add Darwin support for lit tests

This patch enables running lit tests on OS X:
1) Simply enable tests for Darwin (they were restricted to Linux and FreeBSD).
2) Disable using instrumented libcxx (libcxx_tsan) on Darwin.
3) On Darwin, override abort_on_error=0, otherwise all tests would generate crash logs and take much longer to process.

Differential Revision: http://reviews.llvm.org/D14439


Modified:
    compiler-rt/trunk/test/tsan/lit.cfg

Modified: compiler-rt/trunk/test/tsan/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/lit.cfg?rev=252309&r1=252308&r2=252309&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/lit.cfg (original)
+++ compiler-rt/trunk/test/tsan/lit.cfg Fri Nov  6 09:05:34 2015
@@ -20,6 +20,11 @@ config.test_source_root = os.path.dirnam
 # Setup environment variables for running ThreadSanitizer.
 tsan_options = "atexit_sleep_ms=0"
 
+if config.host_os == 'Darwin':
+  # On Darwin, we default to `abort_on_error=1`, which would make tests run
+  # much slower. Let's override this and run lit tests with 'abort_on_error=0'.
+  tsan_options += ':abort_on_error=0'
+
 config.environment['TSAN_OPTIONS'] = tsan_options
 
 # GCC driver doesn't add necessary compile/link flags with -fsanitize=thread.
@@ -34,7 +39,8 @@ clang_tsan_cflags = ["-fsanitize=thread"
                      "-m64"] + config.debug_info_flags + extra_cflags
 clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags
 # Add additional flags if we're using instrumented libc++.
-if config.has_libcxx:
+# Instrumented libcxx currently not supported on Darwin.
+if config.has_libcxx and config.host_os != 'Darwin':
   # FIXME: Dehardcode this path somehow.
   libcxx_path = os.path.join(config.compiler_rt_obj_root, "lib",
                              "tsan", "libcxx_tsan")
@@ -60,8 +66,8 @@ config.substitutions.append( ("%deflake
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
-# ThreadSanitizer tests are currently supported on FreeBSD and Linux only.
-if config.host_os not in ['FreeBSD', 'Linux']:
+# ThreadSanitizer tests are currently supported on FreeBSD, Linux and Darwin.
+if config.host_os not in ['FreeBSD', 'Linux', 'Darwin']:
   config.unsupported = True
 
 # Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL




More information about the llvm-commits mailing list