From 3f769be9ebf0dca3d27e9018384f561c86b10846 Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Sun, 16 Feb 2014 10:15:57 +0000
Subject: [PATCH] check-clang: Introduce the feature "non-ms-sdk" to suppress
 Driver/nostdincxx.cpp on msvc.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201484 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/Driver/nostdincxx.cpp | 4 +++-
 test/lit.cfg               | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/Driver/nostdincxx.cpp b/test/Driver/nostdincxx.cpp
index 1e1d85f358..126828de9a 100644
--- a/test/Driver/nostdincxx.cpp
+++ b/test/Driver/nostdincxx.cpp
@@ -1,4 +1,6 @@
 // RUN: not %clangxx -nostdinc++ %s 2>&1 | FileCheck %s
-// XFAIL: win32
 // CHECK: file not found
 #include <vector> 
+
+// MSVC has C++ headers in same directory as C headers.
+// REQUIRES: non-ms-sdk
diff --git a/test/lit.cfg b/test/lit.cfg
index e86628fe17..b75b4bcf3c 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -340,6 +340,10 @@ if os.path.exists("/dev/fd/0") and sys.platform not in ['cygwin']:
 if not re.match(r'.*-win32$', config.target_triple):
     config.available_features.add('dw2')
 
+# Not set on native MS environment.
+if not re.match(r'.*-win32$', config.target_triple):
+    config.available_features.add('non-ms-sdk')
+
 # [PR8833] LLP64-incompatible tests
 if not re.match(r'^x86_64.*-(win32|mingw32)$', config.target_triple):
     config.available_features.add('LP64')
-- 
2.40.0