diff options
| author | Reid Kleckner <rnk@google.com> | 2016-10-20 23:11:45 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-10-20 23:11:45 +0000 |
| commit | 2e1538f282802873e5b5b3a4406055802545bf98 (patch) | |
| tree | 8f2ced7c92c20eab8c55e02d92894a10a7e4b02b /clang/test/Modules | |
| parent | ffd9175f743b47d43d61d9f853d24949d089b5ac (diff) | |
| download | bcm5719-llvm-2e1538f282802873e5b5b3a4406055802545bf98.tar.gz bcm5719-llvm-2e1538f282802873e5b5b3a4406055802545bf98.zip | |
Remove 24 instances of 'REQUIRES: shell'
Tests fall into one of the following categories:
- The requirement was unnecessary
- Additional quoting was required for backslashes in paths (see "sed -e
's/\\/\\\\/g'") in the sanitizer tests.
- OpenMP used 'REQUIRES: shell' as a proxy for the test failing on
Windows. Those tests fail there reliably, so use XFAIL instead.
I tried not to remove shell requirements that were added to suppress
flaky test failures, but if I screwed up, we can add it back as needed.
llvm-svn: 284793
Diffstat (limited to 'clang/test/Modules')
| -rw-r--r-- | clang/test/Modules/ModuleDebugInfo.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Modules/ModuleDebugInfo.m | 2 | ||||
| -rw-r--r-- | clang/test/Modules/dependency-dump-dependent-module.m | 6 | ||||
| -rw-r--r-- | clang/test/Modules/empty.modulemap | 1 | ||||
| -rw-r--r-- | clang/test/Modules/explicit-build-extra-files.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Modules/prune.m | 7 | ||||
| -rw-r--r-- | clang/test/Modules/signal.m | 2 |
7 files changed, 5 insertions, 17 deletions
diff --git a/clang/test/Modules/ModuleDebugInfo.cpp b/clang/test/Modules/ModuleDebugInfo.cpp index 1bc0613f427..71b05e5aeb8 100644 --- a/clang/test/Modules/ModuleDebugInfo.cpp +++ b/clang/test/Modules/ModuleDebugInfo.cpp @@ -1,7 +1,7 @@ // Test that (the same) debug info is emitted for an Objective-C++ // module and a C++ precompiled header. -// REQUIRES: asserts, shell +// REQUIRES: asserts // Modules: // RUN: rm -rf %t diff --git a/clang/test/Modules/ModuleDebugInfo.m b/clang/test/Modules/ModuleDebugInfo.m index ce35c7c8361..d1a0e8d5e80 100644 --- a/clang/test/Modules/ModuleDebugInfo.m +++ b/clang/test/Modules/ModuleDebugInfo.m @@ -1,7 +1,7 @@ // Test that debug info is emitted for an Objective-C module and // a precompiled header. -// REQUIRES: asserts, shell +// REQUIRES: asserts // Modules: // RUN: rm -rf %t diff --git a/clang/test/Modules/dependency-dump-dependent-module.m b/clang/test/Modules/dependency-dump-dependent-module.m index df7f5326bb6..2430726d3ae 100644 --- a/clang/test/Modules/dependency-dump-dependent-module.m +++ b/clang/test/Modules/dependency-dump-dependent-module.m @@ -14,9 +14,3 @@ // VFS: 'name': "Sub2.h" @import AlsoDependsOnModule; - -// FIXME: This fails on win32 due to ERROR_FILENAME_EXCED_RANGE -// if the working directory is too deep. -// We should make Win32/Path.inc capable of long pathnames with '\\?\'. -// For now, this is suppressed on win32. -// REQUIRES: shell diff --git a/clang/test/Modules/empty.modulemap b/clang/test/Modules/empty.modulemap index 0d1718409d5..aa9eba66a4f 100644 --- a/clang/test/Modules/empty.modulemap +++ b/clang/test/Modules/empty.modulemap @@ -14,7 +14,6 @@ // RUN: diff %t/base.pcm %t/check.pcm // // We expect an empty module to be less than 30KB (and at least 10K, for now). -// REQUIRES: shell // RUN: wc -c %t/base.pcm | FileCheck --check-prefix=CHECK-SIZE %s // CHECK-SIZE: {{(^|[^0-9])[12][0-9][0-9][0-9][0-9]($|[^0-9])}} diff --git a/clang/test/Modules/explicit-build-extra-files.cpp b/clang/test/Modules/explicit-build-extra-files.cpp index 6cec420832d..965aea13ae1 100644 --- a/clang/test/Modules/explicit-build-extra-files.cpp +++ b/clang/test/Modules/explicit-build-extra-files.cpp @@ -1,5 +1,3 @@ -// REQUIRES: shell -// // RUN: rm -rf %t // RUN: mkdir %t // RUN: cd %t diff --git a/clang/test/Modules/prune.m b/clang/test/Modules/prune.m index 6676407c9ac..58992f9c006 100644 --- a/clang/test/Modules/prune.m +++ b/clang/test/Modules/prune.m @@ -5,9 +5,6 @@ @import Module; #endif -// We need 'touch' and 'find' for this test to work. -// REQUIRES: shell - // Clear out the module cache // RUN: rm -rf %t // Run Clang twice so we end up creating the timestamp file (the second time). @@ -28,7 +25,7 @@ // Set the DependsOnModule access time back more than four days. // This shouldn't prune anything, because the timestamp has been updated, so // the pruning mechanism won't fire. -// RUN: find %t -name DependsOnModule*.pcm | xargs touch -a -t 201101010000 +// RUN: find %t -name DependsOnModule*.pcm | sed -e 's/\\/\//g' | xargs touch -a -t 201101010000 // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -F %S/Inputs -fmodules-cache-path=%t -fmodules -fmodules-prune-interval=172800 -fmodules-prune-after=345600 %s -verify // RUN: ls %t | grep modules.timestamp // RUN: ls -R %t | grep ^Module.*pcm @@ -37,7 +34,7 @@ // Set both timestamp and DependsOnModule.pcm back beyond the cutoff. // This should trigger pruning, which will remove DependsOnModule but not Module. // RUN: touch -m -a -t 201101010000 %t/modules.timestamp -// RUN: find %t -name DependsOnModule*.pcm | xargs touch -a -t 201101010000 +// RUN: find %t -name DependsOnModule*.pcm | sed -e 's/\\/\//g' | xargs touch -a -t 201101010000 // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -F %S/Inputs -fmodules-cache-path=%t -fmodules -fmodules-prune-interval=172800 -fmodules-prune-after=345600 %s -verify // RUN: ls %t | grep modules.timestamp // RUN: ls -R %t | grep ^Module.*pcm diff --git a/clang/test/Modules/signal.m b/clang/test/Modules/signal.m index 37a35506447..4d0885e56c8 100644 --- a/clang/test/Modules/signal.m +++ b/clang/test/Modules/signal.m @@ -1,4 +1,4 @@ -// REQUIRES: crash-recovery,shell +// REQUIRES: crash-recovery // RUN: rm -rf %t // Crash building module. |

