Replace lit feature keyword 'non-ms-sdk' with 'ms-sdk'; eliminate

'non-ps4-sdk' and use just 'ps4'.

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

diff --git a/test/Driver/nostdincxx.cpp b/test/Driver/nostdincxx.cpp
index f2305adb7e8fad29ff5b428c21a0fc13e29294b2..dc87336ece54c26b119caeaa744c859d29011154 100644 (file)
--- a/test/Driver/nostdincxx.cpp
+++ b/test/Driver/nostdincxx.cpp
@@ -2,6 +2,5 @@
 // CHECK: file not found
 #include <vector> 
 
-// MSVC has C++ headers in same directory as C headers.
-// REQUIRES: non-ms-sdk
-// REQUIRES: non-ps4-sdk
+// MSVC and PS4 have C++ headers in the same directory as C headers.
+// UNSUPPORTED: ms-sdk, ps4

diff --git a/test/Modules/crash-vfs-path-traversal.m b/test/Modules/crash-vfs-path-traversal.m
index b924d81d0467df2c55416fa9cd36f9a10b42128f..1a2550b1c931280cb484c58cc31dc7d5fddc03f0 100644 (file)
--- a/test/Modules/crash-vfs-path-traversal.m
+++ b/test/Modules/crash-vfs-path-traversal.m
@@ -1,4 +1,5 @@
-// REQUIRES: crash-recovery, shell, non-ms-sdk, non-ps4-sdk
+// REQUIRES: crash-recovery, shell
+// UNSUPPORTED: ms-sdk, ps4
 
 // FIXME: Canonicalizing paths to remove relative traversal components
 // currenty fails a unittest on windows and is disable by default.

diff --git a/test/Preprocessor/pragma_microsoft.c b/test/Preprocessor/pragma_microsoft.c
index 0e1f1dbd1c32a418be0305c917212478ac90e5e7..9d62d01838749e3a0592f01e37d6d84e401c5d7a 100644 (file)
--- a/test/Preprocessor/pragma_microsoft.c
+++ b/test/Preprocessor/pragma_microsoft.c
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -triple i686-unknown-windows-msvc %s -fsyntax-only -verify -fms-extensions -Wunknown-pragmas
 // RUN: not %clang_cc1 -triple i686-unknown-windows-msvc %s -fms-extensions -E | FileCheck %s
-// REQUIRES: non-ps4-sdk
+// UNSUPPORTED: ps4
 
 // rdar://6495941
 
@@ -215,4 +215,4 @@ void g() {}
 #pragma execution_character_set(push)
 #pragma execution_character_set(push, "utf-8")
 #pragma execution_character_set(push, "UTF-8")
-#pragma execution_character_set(pop)
\ No newline at end of file
+#pragma execution_character_set(pop)

diff --git a/test/lit.cfg.py b/test/lit.cfg.py
index 50c00f6a967469ea97169d739a692993be70c967..ec08cc1eeae64f6a570be9ceba6fbaecb169e458 100644 (file)
--- a/test/lit.cfg.py
+++ b/test/lit.cfg.py
@@ -140,13 +140,9 @@ if is_filesystem_case_insensitive():
 if os.path.exists('/dev/fd/0') and sys.platform not in ['cygwin']:
     config.available_features.add('dev-fd-fs')
 
-# Not set on native MS environment.
-if not re.match(r'.*-(windows-msvc)$', config.target_triple):
-    config.available_features.add('non-ms-sdk')
-
-# Not set on native PS4 environment.
-if not re.match(r'.*-scei-ps4', config.target_triple):
-    config.available_features.add('non-ps4-sdk')
+# Set on native MS environment.
+if re.match(r'.*-(windows-msvc)$', config.target_triple):
+    config.available_features.add('ms-sdk')
 
 # [PR8833] LLP64-incompatible tests
 if not re.match(r'^x86_64.*-(windows-msvc|windows-gnu)$', config.target_triple):