From: Jonas Hahnfeld Date: Thu, 29 Sep 2016 07:43:08 +0000 (+0000) Subject: XFAIL Driver/darwin-stdlib.cpp if CLANG_DEFAULT_CXX_STDLIB is set X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=046fede56da7191aad86c9feb933f6fcffba7f58;p=clang XFAIL Driver/darwin-stdlib.cpp if CLANG_DEFAULT_CXX_STDLIB is set Until someone rewrites the stdlib logic for Darwin so that we don't need to pass down the -stdlib argument to cc1. (see https://llvm.org/bugs/show_bug.cgi?id=30548) Differential Revision: https://reviews.llvm.org/D24601 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@282701 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Driver/darwin-stdlib.cpp b/test/Driver/darwin-stdlib.cpp index c9be6075bb..26cbf2bde3 100644 --- a/test/Driver/darwin-stdlib.cpp +++ b/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/test/lit.cfg b/test/lit.cfg index 497058b58b..ad4cf834f9 100644 --- a/test/lit.cfg +++ b/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/test/lit.site.cfg.in b/test/lit.site.cfg.in index f368c995f5..5e1471f131 100644 --- a/test/lit.site.cfg.in +++ b/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@