diff options
| author | Paul Robinson <paul.robinson@sony.com> | 2019-05-10 13:40:17 +0000 |
|---|---|---|
| committer | Paul Robinson <paul.robinson@sony.com> | 2019-05-10 13:40:17 +0000 |
| commit | 4b66e0fd47c9be0ec53422508512d7dc84e7f872 (patch) | |
| tree | bcd0ab1729afe41359f43a54b223c7eebd497f78 | |
| parent | a67e387de8d5be79e920e8363006bc2672dd3b20 (diff) | |
| download | bcm5719-llvm-4b66e0fd47c9be0ec53422508512d7dc84e7f872.tar.gz bcm5719-llvm-4b66e0fd47c9be0ec53422508512d7dc84e7f872.zip | |
Replace lit feature keyword 'non-ms-sdk' with 'ms-sdk'; eliminate
'non-ps4-sdk' and use just 'ps4'.
llvm-svn: 360425
| -rw-r--r-- | clang/test/Driver/nostdincxx.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Modules/crash-vfs-path-traversal.m | 3 | ||||
| -rw-r--r-- | clang/test/Preprocessor/pragma_microsoft.c | 4 | ||||
| -rw-r--r-- | clang/test/lit.cfg.py | 10 |
4 files changed, 9 insertions, 13 deletions
diff --git a/clang/test/Driver/nostdincxx.cpp b/clang/test/Driver/nostdincxx.cpp index f2305adb7e8..dc87336ece5 100644 --- a/clang/test/Driver/nostdincxx.cpp +++ b/clang/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/clang/test/Modules/crash-vfs-path-traversal.m b/clang/test/Modules/crash-vfs-path-traversal.m index b924d81d046..1a2550b1c93 100644 --- a/clang/test/Modules/crash-vfs-path-traversal.m +++ b/clang/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/clang/test/Preprocessor/pragma_microsoft.c b/clang/test/Preprocessor/pragma_microsoft.c index 0e1f1dbd1c3..9d62d018387 100644 --- a/clang/test/Preprocessor/pragma_microsoft.c +++ b/clang/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/clang/test/lit.cfg.py b/clang/test/lit.cfg.py index 50c00f6a967..ec08cc1eeae 100644 --- a/clang/test/lit.cfg.py +++ b/clang/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): |
