summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/test/asan/TestCases/initialization-bug.cc3
-rw-r--r--compiler-rt/test/lit.common.cfg6
2 files changed, 9 insertions, 0 deletions
diff --git a/compiler-rt/test/asan/TestCases/initialization-bug.cc b/compiler-rt/test/asan/TestCases/initialization-bug.cc
index 8c7d1cdaa51..1f843becaed 100644
--- a/compiler-rt/test/asan/TestCases/initialization-bug.cc
+++ b/compiler-rt/test/asan/TestCases/initialization-bug.cc
@@ -8,6 +8,9 @@
// FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=186
// XFAIL: win32
+// The test is expected to fail on OS X Yosemite and older
+// UNSUPPORTED: osx-no-ld64-live_support
+
#include <cstdio>
// The structure of the test is:
diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg
index e0f9b2717d2..c1a70ffbac7 100644
--- a/compiler-rt/test/lit.common.cfg
+++ b/compiler-rt/test/lit.common.cfg
@@ -125,6 +125,12 @@ if config.host_os == 'Darwin':
if osx_version >= (10, 11):
config.available_features.add('osx-autointerception')
config.available_features.add('osx-ld64-live_support')
+ else:
+ # The ASAN initialization-bug.cc test should XFAIL on OS X systems
+ # older than El Capitan. By marking the test as being unsupported with
+ # this "feature", we can pass the test on newer OS X versions and other
+ # platforms.
+ config.available_features.add('osx-no-ld64-live_support')
except:
pass
OpenPOWER on IntegriCloud