From a9980f60ce083fa6d5fd03c12c58ca0b293e3d60 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 10 Sep 2019 00:50:32 +0000 Subject: [PATCH] Remove REQUIRES:shell from tests that pass for me on Windows I see in the history for some of these tests REQUIRES:shell was used as a way to disable tests on Windows because they are flaky there. I tried not to re-enable such tests, but it's possible that I missed some and this will re-enable flaky tests on Windows. If so, we should disable them with UNSUPPORTED:system-windows and add a comment that they are flaky there. So far as I can tell, the lit internal shell is capable of running all of these tests, and we shouldn't use REQUIRES:shell as a proxy for Windows. llvm-svn: 371478 --- clang/test/Analysis/crash-trace.c | 7 +++---- clang/test/CodeGen/thinlto_backend.ll | 11 +++++++---- clang/test/Driver/check-time-trace-sections.cpp | 1 - clang/test/Driver/check-time-trace.cpp | 1 - clang/test/Driver/clang-offload-bundler.c | 3 +-- clang/test/Driver/crash-report-crashfile.m | 2 +- clang/test/Driver/rewrite-map-in-diagnostics.c | 3 --- clang/test/Format/style-on-command-line.cpp | 2 +- clang/test/Frontend/dependency-gen-has-include.c | 14 ++++++-------- clang/test/Index/crash-recovery-modules.m | 3 +-- clang/test/Modules/at-import-in-framework-header.m | 2 -- clang/test/Modules/builtins.m | 1 - clang/test/Modules/dependency-dump-dependent-module.m | 2 -- clang/test/Modules/dependency-dump.m | 2 -- clang/test/Modules/implicit-invalidate-common.c | 1 - clang/test/OpenMP/task_firstprivate_codegen.cpp | 2 -- clang/test/OpenMP/task_private_codegen.cpp | 2 -- clang/test/OpenMP/taskloop_firstprivate_codegen.cpp | 3 +-- clang/test/OpenMP/taskloop_lastprivate_codegen.cpp | 3 +-- clang/test/OpenMP/taskloop_private_codegen.cpp | 2 -- clang/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp | 3 +-- clang/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp | 3 +-- clang/test/OpenMP/taskloop_simd_private_codegen.cpp | 2 -- clang/test/PCH/modified-header-error.c | 4 +++- clang/test/Parser/crash-report.c | 3 +-- 25 files changed, 28 insertions(+), 54 deletions(-) diff --git a/clang/test/Analysis/crash-trace.c b/clang/test/Analysis/crash-trace.c index ef1763e..0c8c8cc 100644 --- a/clang/test/Analysis/crash-trace.c +++ b/clang/test/Analysis/crash-trace.c @@ -1,9 +1,8 @@ // RUN: not --crash %clang_analyze_cc1 -analyzer-checker=debug.ExprInspection %s 2>&1 | FileCheck %s // REQUIRES: crash-recovery -// FIXME: CHECKs might be incompatible to win32. -// Stack traces also require back traces. -// REQUIRES: shell, backtrace +// Stack traces require back traces. +// REQUIRES: backtrace void clang_analyzer_crash(void); @@ -18,6 +17,6 @@ void test() { // CHECK: 0. Program arguments: {{.*}}clang // CHECK-NEXT: 1. parser at end of file // CHECK-NEXT: 2. While analyzing stack: -// CHECK-NEXT: #0 Calling inlined at line 15 +// CHECK-NEXT: #0 Calling inlined at line 14 // CHECK-NEXT: #1 Calling test // CHECK-NEXT: 3. {{.*}}crash-trace.c:{{[0-9]+}}:3: Error evaluating statement diff --git a/clang/test/CodeGen/thinlto_backend.ll b/clang/test/CodeGen/thinlto_backend.ll index 2dd919d..fcfc7ea 100644 --- a/clang/test/CodeGen/thinlto_backend.ll +++ b/clang/test/CodeGen/thinlto_backend.ll @@ -1,5 +1,4 @@ -; shell required since the windows bot does not like the "(cd ..." -; REQUIRES: x86-registered-target, shell +; REQUIRES: x86-registered-target ; RUN: opt -module-summary -o %t1.o %s ; RUN: opt -module-summary -o %t2.o %S/Inputs/thinlto_backend.ll @@ -32,10 +31,14 @@ ; RUN: %clang -target x86_64-unknown-linux-gnu -O2 -o %t3.o -x ir %t1.o -c -fthinlto-index=%t.thinlto.bc -save-temps=obj ; RUN: llvm-dis %t1.s.3.import.bc -o - | FileCheck --check-prefix=CHECK-IMPORT %s ; RUN: mkdir -p %T/dir1 -; RUN: (cd %T/dir1 && %clang -target x86_64-unknown-linux-gnu -O2 -o %t3.o -x ir %t1.o -c -fthinlto-index=%t.thinlto.bc -save-temps=cwd) +; RUN: cd %T/dir1 +; RUN: %clang -target x86_64-unknown-linux-gnu -O2 -o %t3.o -x ir %t1.o -c -fthinlto-index=%t.thinlto.bc -save-temps=cwd +; RUN: cd ../.. ; RUN: llvm-dis %T/dir1/*1.s.3.import.bc -o - | FileCheck --check-prefix=CHECK-IMPORT %s ; RUN: mkdir -p %T/dir2 -; RUN: (cd %T/dir2 && %clang -target x86_64-unknown-linux-gnu -O2 -o %t3.o -x ir %t1.o -c -fthinlto-index=%t.thinlto.bc -save-temps) +; RUN: cd %T/dir2 +; RUN: %clang -target x86_64-unknown-linux-gnu -O2 -o %t3.o -x ir %t1.o -c -fthinlto-index=%t.thinlto.bc -save-temps +; RUN: cd ../.. ; RUN: llvm-dis %T/dir2/*1.s.3.import.bc -o - | FileCheck --check-prefix=CHECK-IMPORT %s ; CHECK-IMPORT: define available_externally void @f2() ; RUN: llvm-nm %t3.o | FileCheck --check-prefix=CHECK-OBJ %s diff --git a/clang/test/Driver/check-time-trace-sections.cpp b/clang/test/Driver/check-time-trace-sections.cpp index 4d1c0fde..2dbe203 100644 --- a/clang/test/Driver/check-time-trace-sections.cpp +++ b/clang/test/Driver/check-time-trace-sections.cpp @@ -1,4 +1,3 @@ -// REQUIRES: shell // RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o %T/check-time-trace-sections %s // RUN: cat %T/check-time-trace-sections.json | %python %S/check-time-trace-sections.py diff --git a/clang/test/Driver/check-time-trace.cpp b/clang/test/Driver/check-time-trace.cpp index 9d381786..3c6a002 100644 --- a/clang/test/Driver/check-time-trace.cpp +++ b/clang/test/Driver/check-time-trace.cpp @@ -1,4 +1,3 @@ -// REQUIRES: shell // RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o %T/check-time-trace %s // RUN: cat %T/check-time-trace.json \ // RUN: | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \ diff --git a/clang/test/Driver/clang-offload-bundler.c b/clang/test/Driver/clang-offload-bundler.c index 4436692..be17b09 100644 --- a/clang/test/Driver/clang-offload-bundler.c +++ b/clang/test/Driver/clang-offload-bundler.c @@ -1,7 +1,6 @@ // REQUIRES: x86-registered-target // REQUIRES: powerpc-registered-target -// REQUIRES: shell -// UNSUPPORTED: ms-sdk, darwin +// UNSUPPORTED: darwin // // Generate all the types of files we can bundle. diff --git a/clang/test/Driver/crash-report-crashfile.m b/clang/test/Driver/crash-report-crashfile.m index fbfb532..bdfac32 100644 --- a/clang/test/Driver/crash-report-crashfile.m +++ b/clang/test/Driver/crash-report-crashfile.m @@ -1,4 +1,4 @@ -// REQUIRES: crash-recovery, shell, system-darwin +// REQUIRES: crash-recovery, system-darwin // RUN: rm -rf %t // RUN: mkdir -p %t/i %t/m %t diff --git a/clang/test/Driver/rewrite-map-in-diagnostics.c b/clang/test/Driver/rewrite-map-in-diagnostics.c index 4aea0ec..7c58115 100644 --- a/clang/test/Driver/rewrite-map-in-diagnostics.c +++ b/clang/test/Driver/rewrite-map-in-diagnostics.c @@ -9,6 +9,3 @@ // CHECK: note: diagnostic msg: {{.*}}rewrite.map // REQUIRES: crash-recovery - -// FIXME: This doesn't fail on "env clang". Investigating. -// REQUIRES: shell diff --git a/clang/test/Format/style-on-command-line.cpp b/clang/test/Format/style-on-command-line.cpp index 0e6078e..ba06bab 100644 --- a/clang/test/Format/style-on-command-line.cpp +++ b/clang/test/Format/style-on-command-line.cpp @@ -39,4 +39,4 @@ int j; // On Windows, the 'rm' commands fail when the previous process is still alive. // This happens enough to make the test useless. -// REQUIRES: shell +// UNSUPPORTED: system-windows diff --git a/clang/test/Frontend/dependency-gen-has-include.c b/clang/test/Frontend/dependency-gen-has-include.c index e8abb2c..51de72a 100644 --- a/clang/test/Frontend/dependency-gen-has-include.c +++ b/clang/test/Frontend/dependency-gen-has-include.c @@ -1,5 +1,3 @@ -// REQUIRES: shell - // Basic test // RUN: rm -rf %t.dir // RUN: mkdir %t.dir @@ -19,16 +17,16 @@ // RUN: FileCheck -input-file=%t.dir/file.deps %s // CHECK: dependency-gen-has-include.o // CHECK: dependency-gen-has-include.c -// CHECK: a/header.h -// CHECK-NOT: missing/file.h -// CHECK: system/system-header.h -// CHECK: next-a/next-header.h -// CHECK: next-b/next-header.h +// CHECK: a{{[/\\]}}header.h +// CHECK-NOT: missing{{[/\\]}}file.h +// CHECK: system{{[/\\]}}system-header.h +// CHECK: next-a{{[/\\]}}next-header.h +// CHECK: next-b{{[/\\]}}next-header.h // Verify that we ignore system headers in user-only headers mode. // RUN: %clang -MMD -MF %t.dir/user-headers.deps %s -fsyntax-only -I %t.dir -isystem %t.dir/system -I %t.dir/next-a -I %t.dir/next-b // RUN: FileCheck -input-file=%t.dir/user-headers.deps --check-prefix CHECK-USER-HEADER %s -// CHECK-USER-HEADER-NOT: system/system-header.h +// CHECK-USER-HEADER-NOT: system{{[/\\]}}system-header.h #if __has_include("a/header.h") #endif diff --git a/clang/test/Index/crash-recovery-modules.m b/clang/test/Index/crash-recovery-modules.m index 296416d..dab71ed 100644 --- a/clang/test/Index/crash-recovery-modules.m +++ b/clang/test/Index/crash-recovery-modules.m @@ -4,14 +4,13 @@ // Parse the file, such that building the module will cause Clang to crash. // RUN: not env CINDEXTEST_FAILONERROR=1 c-index-test -test-load-source all -fmodules -fmodules-cache-path=%t -Xclang -fdisable-module-hash -I %S/Inputs/Headers -DCRASH %s > /dev/null 2> %t.err // RUN: FileCheck < %t.err -check-prefix=CHECK-CRASH %s -// CHECK-CRASH: crash-recovery-modules.m:17:9:{17:2-17:14}: fatal error: could not build module 'Crash' +// CHECK-CRASH: crash-recovery-modules.m:16:9:{16:2-16:14}: fatal error: could not build module 'Crash' // Parse the file again, without crashing, to make sure that // subsequent parses do the right thing. // RUN: env CINDEXTEST_FAILONERROR=1 c-index-test -test-load-source all -fmodules -fmodules-cache-path=%t -Xclang -fdisable-module-hash -I %S/Inputs/Headers %s > /dev/null // REQUIRES: crash-recovery -// REQUIRES: shell // UNSUPPORTED: libstdcxx-safe-mode @import Crash; diff --git a/clang/test/Modules/at-import-in-framework-header.m b/clang/test/Modules/at-import-in-framework-header.m index fe36638..043c694 100644 --- a/clang/test/Modules/at-import-in-framework-header.m +++ b/clang/test/Modules/at-import-in-framework-header.m @@ -1,5 +1,3 @@ -// REQUIRES: shell - // RUN: rm -rf %t // RUN: mkdir %t diff --git a/clang/test/Modules/builtins.m b/clang/test/Modules/builtins.m index 88a44e7..2480e63 100644 --- a/clang/test/Modules/builtins.m +++ b/clang/test/Modules/builtins.m @@ -8,7 +8,6 @@ // RUN: %clang_cc1 -fmodules-cache-path=%t.pch.cache -fmodules -fimplicit-module-maps -I %S/Inputs %s -include-pch %t.pch %s -verify // expected-no-diagnostics -// REQUIRES: shell void use_constant_string_builtins1(void) { (void)__builtin___CFStringMakeConstantString(""); diff --git a/clang/test/Modules/dependency-dump-dependent-module.m b/clang/test/Modules/dependency-dump-dependent-module.m index 4906986..2430726 100644 --- a/clang/test/Modules/dependency-dump-dependent-module.m +++ b/clang/test/Modules/dependency-dump-dependent-module.m @@ -1,8 +1,6 @@ // When a module depends on another, check that we dump the dependency header // files for both. -// REQUIRES: shell - // RUN: rm -rf %t // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -module-dependency-dir %t/vfs -F %S/Inputs -I %S/Inputs -verify %s // expected-no-diagnostics diff --git a/clang/test/Modules/dependency-dump.m b/clang/test/Modules/dependency-dump.m index deb6618..f3a4875 100644 --- a/clang/test/Modules/dependency-dump.m +++ b/clang/test/Modules/dependency-dump.m @@ -1,8 +1,6 @@ // Check that we can dump all of the headers a module depends on, and a VFS map // for the same. -// REQUIRES: shell - // RUN: rm -rf %t // RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/cache -module-dependency-dir %t/vfs -F %S/Inputs -I %S/Inputs -verify %s // expected-no-diagnostics diff --git a/clang/test/Modules/implicit-invalidate-common.c b/clang/test/Modules/implicit-invalidate-common.c index d6cf90e..143a00f 100644 --- a/clang/test/Modules/implicit-invalidate-common.c +++ b/clang/test/Modules/implicit-invalidate-common.c @@ -1,4 +1,3 @@ -// REQUIRES: shell // RUN: rm -rf %t // RUN: mkdir -p %t/implicit-invalidate-common // RUN: cp -r %S/Inputs/implicit-invalidate-common %t/ diff --git a/clang/test/OpenMP/task_firstprivate_codegen.cpp b/clang/test/OpenMP/task_firstprivate_codegen.cpp index 0517ec1..e9c6d6d 100644 --- a/clang/test/OpenMP/task_firstprivate_codegen.cpp +++ b/clang/test/OpenMP/task_firstprivate_codegen.cpp @@ -13,8 +13,6 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. -// REQUIRES: shell #ifndef ARRAY #ifndef HEADER #define HEADER diff --git a/clang/test/OpenMP/task_private_codegen.cpp b/clang/test/OpenMP/task_private_codegen.cpp index 17b0de1..32303cd 100644 --- a/clang/test/OpenMP/task_private_codegen.cpp +++ b/clang/test/OpenMP/task_private_codegen.cpp @@ -13,8 +13,6 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. Investigating. -// REQUIRES: shell #ifndef ARRAY #ifndef HEADER diff --git a/clang/test/OpenMP/taskloop_firstprivate_codegen.cpp b/clang/test/OpenMP/taskloop_firstprivate_codegen.cpp index 0aa9f3e..6472381 100644 --- a/clang/test/OpenMP/taskloop_firstprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_firstprivate_codegen.cpp @@ -13,8 +13,7 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. -// REQUIRES: shell + #ifndef ARRAY #ifndef HEADER #define HEADER diff --git a/clang/test/OpenMP/taskloop_lastprivate_codegen.cpp b/clang/test/OpenMP/taskloop_lastprivate_codegen.cpp index 6e65885..1df56ac 100644 --- a/clang/test/OpenMP/taskloop_lastprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_lastprivate_codegen.cpp @@ -15,8 +15,7 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DLOOP -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck -check-prefix=SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. -// REQUIRES: shell + #if !defined(ARRAY) && !defined(LOOP) #ifndef HEADER #define HEADER diff --git a/clang/test/OpenMP/taskloop_private_codegen.cpp b/clang/test/OpenMP/taskloop_private_codegen.cpp index c7a85a4..01c387e 100644 --- a/clang/test/OpenMP/taskloop_private_codegen.cpp +++ b/clang/test/OpenMP/taskloop_private_codegen.cpp @@ -13,8 +13,6 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. Investigating. -// REQUIRES: shell #ifndef ARRAY #ifndef HEADER diff --git a/clang/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp b/clang/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp index 5f0b5de..935aacc 100644 --- a/clang/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp @@ -13,8 +13,7 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. -// REQUIRES: shell + #ifndef ARRAY #ifndef HEADER #define HEADER diff --git a/clang/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp b/clang/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp index 051c843..97007dd 100644 --- a/clang/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp @@ -13,8 +13,7 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. -// REQUIRES: shell + #ifndef ARRAY #ifndef HEADER #define HEADER diff --git a/clang/test/OpenMP/taskloop_simd_private_codegen.cpp b/clang/test/OpenMP/taskloop_simd_private_codegen.cpp index 2425d23..29b9c83 100644 --- a/clang/test/OpenMP/taskloop_simd_private_codegen.cpp +++ b/clang/test/OpenMP/taskloop_simd_private_codegen.cpp @@ -13,8 +13,6 @@ // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -std=c++11 -DARRAY -triple x86_64-apple-darwin10 -emit-llvm %s -o - | FileCheck --check-prefix SIMD-ONLY0 %s // SIMD-ONLY0-NOT: {{__kmpc|__tgt}} // expected-no-diagnostics -// It doesn't pass on win32. Investigating. -// REQUIRES: shell #ifndef ARRAY #ifndef HEADER diff --git a/clang/test/PCH/modified-header-error.c b/clang/test/PCH/modified-header-error.c index 8ab38e1..fb63836 100644 --- a/clang/test/PCH/modified-header-error.c +++ b/clang/test/PCH/modified-header-error.c @@ -9,4 +9,6 @@ #include "header2.h" // CHECK: fatal error: file {{.*}} has been modified since the precompiled header {{.*}} was built -// REQUIRES: shell + +// FIXME: Flaky on Windows, timestamp resolution? +// UNSUPPORTED: win32 diff --git a/clang/test/Parser/crash-report.c b/clang/test/Parser/crash-report.c index ef65b88..6ca1045 100644 --- a/clang/test/Parser/crash-report.c +++ b/clang/test/Parser/crash-report.c @@ -1,9 +1,8 @@ // RUN: not --crash %clang_cc1 %s 2>&1 | FileCheck %s // REQUIRES: crash-recovery -// FIXME: CHECKs might be incompatible to win32. // Stack traces also require back traces. -// REQUIRES: shell, backtrace +// REQUIRES: backtrace #prag\ ma clang __debug crash -- 2.7.4