From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Tue, 21 May 2019 20:10:52 +0000 (+0000)
Subject: Fix test failures after r361278 on non-Darwin platforms and when
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52cec611bdf259de67b159f915be7bec66a435fb;p=clang

Fix test failures after r361278 on non-Darwin platforms and when
CLANG_DEFAULT_STDLIB is defined to libstdc++.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@361301 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Driver/darwin-header-search-libcxx.cpp b/test/Driver/darwin-header-search-libcxx.cpp
index 6111ac8f09..98bd095448 100644
--- a/test/Driver/darwin-header-search-libcxx.cpp
+++ b/test/Driver/darwin-header-search-libcxx.cpp
@@ -52,10 +52,11 @@
 // C++ library include paths (so all except <toolchain>/usr/bin/../include/c++/v1).
 //
 // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
-// RUN:     -target x86_64-apple-darwin \
+// RUN:     -target x86_64-apple-darwin16 \
 // RUN:     -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \
 // RUN:     -resource-dir=%S/Inputs/resource_dir \
 // RUN:     -isysroot %S/Inputs/basic_darwin_sdk_usr \
+// RUN:     -stdlib=platform \
 // RUN:     -nostdinc \
 // RUN:   | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr \
 // RUN:               -DTOOLCHAIN=%S/Inputs/basic_darwin_toolchain \
@@ -65,10 +66,11 @@
 // CHECK-LIBCXX-NOSTDINC-NOT: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1"
 //
 // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
-// RUN:     -target x86_64-apple-darwin \
+// RUN:     -target x86_64-apple-darwin16 \
 // RUN:     -ccc-install-dir %S/Inputs/basic_darwin_toolchain/usr/bin \
 // RUN:     -resource-dir=%S/Inputs/resource_dir \
 // RUN:     -isysroot %S/Inputs/basic_darwin_sdk_usr \
+// RUN:     -stdlib=platform \
 // RUN:     -nostdinc \
 // RUN:   | FileCheck -DSYSROOT=%S/Inputs/basic_darwin_sdk_usr \
 // RUN:               -DTOOLCHAIN=%S/Inputs/basic_darwin_toolchain \
diff --git a/test/Driver/darwin-header-search-libstdcxx.cpp b/test/Driver/darwin-header-search-libstdcxx.cpp
index 66dff67301..480fb8c6de 100644
--- a/test/Driver/darwin-header-search-libstdcxx.cpp
+++ b/test/Driver/darwin-header-search-libstdcxx.cpp
@@ -112,7 +112,7 @@
 // RUN:    | FileCheck -allow-empty --check-prefix=CHECK-LIBSTDCXX-MISSING-1 %s
 // CHECK-LIBSTDCXX-MISSING-1-NOT: warning
 //
-// RUN: %clang %s -target x86_64-apple-darwin -fsyntax-only 2>&1 \
-// RUN:           -isysroot %S/Inputs/basic_darwin_sdk_no_libstdcxx \
+// RUN: %clang %s -target x86_64-apple-darwin16 -fsyntax-only 2>&1 \
+// RUN:           -isysroot %S/Inputs/basic_darwin_sdk_no_libstdcxx -stdlib=platform \
 // RUN:    | FileCheck -allow-empty --check-prefix=CHECK-LIBSTDCXX-MISSING-2 %s
 // CHECK-LIBSTDCXX-MISSING-2-NOT: warning