From d7dcffaea4ba2cfa3e6582ea61e6b07ec7bd9bde Mon Sep 17 00:00:00 2001 From: Juergen Ributzka Date: Wed, 4 Nov 2015 21:03:12 +0000 Subject: Revert "Reapply: [asan] On OS X, log reports to syslog and os_trace" Looks like this commit is deadlocking the ASAN tests on the green dragon bot (http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA/). llvm-svn: 252076 --- compiler-rt/test/asan/lit.cfg | 2 -- compiler-rt/test/ubsan/lit.common.cfg | 1 - 2 files changed, 3 deletions(-) (limited to 'compiler-rt/test') diff --git a/compiler-rt/test/asan/lit.cfg b/compiler-rt/test/asan/lit.cfg index 835547090a1..fd99f669961 100644 --- a/compiler-rt/test/asan/lit.cfg +++ b/compiler-rt/test/asan/lit.cfg @@ -34,9 +34,7 @@ default_asan_opts = '' 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'. - # Also, make sure we do not overwhelm the syslog while testing. default_asan_opts = 'abort_on_error=0' - default_asan_opts += ':log_to_syslog=0' if default_asan_opts: config.environment['ASAN_OPTIONS'] = default_asan_opts default_asan_opts += ':' diff --git a/compiler-rt/test/ubsan/lit.common.cfg b/compiler-rt/test/ubsan/lit.common.cfg index e50862983d6..8e844066642 100644 --- a/compiler-rt/test/ubsan/lit.common.cfg +++ b/compiler-rt/test/ubsan/lit.common.cfg @@ -42,7 +42,6 @@ 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'. default_ubsan_opts += ['abort_on_error=0'] - default_ubsan_opts += ['log_to_syslog=0'] default_ubsan_opts_str = ':'.join(default_ubsan_opts) if default_ubsan_opts_str: config.environment['UBSAN_OPTIONS'] = default_ubsan_opts_str -- cgit v1.2.3