summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/test/Driver/darwin-stdlib.cpp4
-rw-r--r--clang/test/lit.cfg3
-rw-r--r--clang/test/lit.site.cfg.in1
3 files changed, 8 insertions, 0 deletions
diff --git a/clang/test/Driver/darwin-stdlib.cpp b/clang/test/Driver/darwin-stdlib.cpp
index c9be6075bb0..26cbf2bde34 100644
--- a/clang/test/Driver/darwin-stdlib.cpp
+++ b/clang/test/Driver/darwin-stdlib.cpp
@@ -1,3 +1,7 @@
+// This test will fail if CLANG_DEFAULT_CXX_STDLIB is set to anything different
+// than the platform default. (see https://llvm.org/bugs/show_bug.cgi?id=30548)
+// XFAIL: default-cxx-stdlib-set
+
// RUN: %clang -target x86_64-apple-darwin -arch arm64 -miphoneos-version-min=7.0 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBCXX
// RUN: %clang -target x86_64-apple-darwin -mmacosx-version-min=10.8 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBSTDCXX
// RUN: %clang -target x86_64-apple-darwin -mmacosx-version-min=10.9 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-LIBCXX
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index 497058b58be..ad4cf834f91 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -343,6 +343,9 @@ for pattern in tool_patterns:
# Set available features we allow tests to conditionalize on.
#
+if config.clang_default_cxx_stdlib != '':
+ config.available_features.add('default-cxx-stdlib-set')
+
# Enabled/disabled features
if config.clang_staticanalyzer != 0:
config.available_features.add("staticanalyzer")
diff --git a/clang/test/lit.site.cfg.in b/clang/test/lit.site.cfg.in
index f368c995f56..5e1471f1311 100644
--- a/clang/test/lit.site.cfg.in
+++ b/clang/test/lit.site.cfg.in
@@ -16,6 +16,7 @@ config.target_triple = "@TARGET_TRIPLE@"
config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
config.have_zlib = "@HAVE_LIBZ@"
config.clang_arcmt = @ENABLE_CLANG_ARCMT@
+config.clang_default_cxx_stdlib = "@CLANG_DEFAULT_CXX_STDLIB@"
config.clang_staticanalyzer = @ENABLE_CLANG_STATIC_ANALYZER@
config.clang_examples = @ENABLE_CLANG_EXAMPLES@
config.enable_shared = @ENABLE_SHARED@
OpenPOWER on IntegriCloud