From 3d7e9ab7b9f8c53aa41420c54970f0fb421004a2 Mon Sep 17 00:00:00 2001 From: James Henderson Date: Tue, 10 Sep 2019 08:48:33 +0000 Subject: [PATCH] Revert Remove REQUIRES:shell from tests that pass for me on Windows This reverts r371478 (git commit a9980f60ce083fa6d5fd03c12c58ca0b293e3d60) llvm-svn: 371497 --- 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, 54 insertions(+), 28 deletions(-) diff --git a/clang/test/Analysis/crash-trace.c b/clang/test/Analysis/crash-trace.c index 0c8c8cc..ef1763e 100644 --- a/clang/test/Analysis/crash-trace.c +++ b/clang/test/Analysis/crash-trace.c @@ -1,8 +1,9 @@ // RUN: not --crash %clang_analyze_cc1 -analyzer-checker=debug.ExprInspection %s 2>&1 | FileCheck %s // REQUIRES: crash-recovery -// Stack traces require back traces. -// REQUIRES: backtrace +// FIXME: CHECKs might be incompatible to win32. +// Stack traces also require back traces. +// REQUIRES: shell, backtrace void clang_analyzer_crash(void); @@ -17,6 +18,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 14 +// CHECK-NEXT: #0 Calling inlined at line 15 // 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 fcfc7ea..2dd919d 100644 --- a/clang/test/CodeGen/thinlto_backend.ll +++ b/clang/test/CodeGen/thinlto_backend.ll @@ -1,4 +1,5 @@ -; REQUIRES: x86-registered-target +; shell required since the windows bot does not like the "(cd ..." +; REQUIRES: x86-registered-target, shell ; RUN: opt -module-summary -o %t1.o %s ; RUN: opt -module-summary -o %t2.o %S/Inputs/thinlto_backend.ll @@ -31,14 +32,10 @@ ; 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 -; 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: (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: 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 -; 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: (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: 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 2dbe203..4d1c0fde 100644 --- a/clang/test/Driver/check-time-trace-sections.cpp +++ b/clang/test/Driver/check-time-trace-sections.cpp @@ -1,3 +1,4 @@ +// 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 3c6a002..9d381786 100644 --- a/clang/test/Driver/check-time-trace.cpp +++ b/clang/test/Driver/check-time-trace.cpp @@ -1,3 +1,4 @@ +// 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 be17b09..4436692 100644 --- a/clang/test/Driver/clang-offload-bundler.c +++ b/clang/test/Driver/clang-offload-bundler.c @@ -1,6 +1,7 @@ // REQUIRES: x86-registered-target // REQUIRES: powerpc-registered-target -// UNSUPPORTED: darwin +// REQUIRES: shell +// UNSUPPORTED: ms-sdk, 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 bdfac32..fbfb532 100644 --- a/clang/test/Driver/crash-report-crashfile.m +++ b/clang/test/Driver/crash-report-crashfile.m @@ -1,4 +1,4 @@ -// REQUIRES: crash-recovery, system-darwin +// REQUIRES: crash-recovery, shell, 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 7c58115..4aea0ec 100644 --- a/clang/test/Driver/rewrite-map-in-diagnostics.c +++ b/clang/test/Driver/rewrite-map-in-diagnostics.c @@ -9,3 +9,6 @@ // 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 ba06bab..0e6078e 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. -// UNSUPPORTED: system-windows +// REQUIRES: shell diff --git a/clang/test/Frontend/dependency-gen-has-include.c b/clang/test/Frontend/dependency-gen-has-include.c index 51de72a..e8abb2c 100644 --- a/clang/test/Frontend/dependency-gen-has-include.c +++ b/clang/test/Frontend/dependency-gen-has-include.c @@ -1,3 +1,5 @@ +// REQUIRES: shell + // Basic test // RUN: rm -rf %t.dir // RUN: mkdir %t.dir @@ -17,16 +19,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 dab71ed..296416d 100644 --- a/clang/test/Index/crash-recovery-modules.m +++ b/clang/test/Index/crash-recovery-modules.m @@ -4,13 +4,14 @@ // 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:16:9:{16:2-16:14}: fatal error: could not build module 'Crash' +// CHECK-CRASH: crash-recovery-modules.m:17:9:{17:2-17: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 043c694..fe36638 100644 --- a/clang/test/Modules/at-import-in-framework-header.m +++ b/clang/test/Modules/at-import-in-framework-header.m @@ -1,3 +1,5 @@ +// REQUIRES: shell + // RUN: rm -rf %t // RUN: mkdir %t diff --git a/clang/test/Modules/builtins.m b/clang/test/Modules/builtins.m index 2480e63..88a44e7 100644 --- a/clang/test/Modules/builtins.m +++ b/clang/test/Modules/builtins.m @@ -8,6 +8,7 @@ // 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 2430726..4906986 100644 --- a/clang/test/Modules/dependency-dump-dependent-module.m +++ b/clang/test/Modules/dependency-dump-dependent-module.m @@ -1,6 +1,8 @@ // 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 f3a4875..deb6618 100644 --- a/clang/test/Modules/dependency-dump.m +++ b/clang/test/Modules/dependency-dump.m @@ -1,6 +1,8 @@ // 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 143a00f..d6cf90e 100644 --- a/clang/test/Modules/implicit-invalidate-common.c +++ b/clang/test/Modules/implicit-invalidate-common.c @@ -1,3 +1,4 @@ +// 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 e9c6d6d..0517ec1 100644 --- a/clang/test/OpenMP/task_firstprivate_codegen.cpp +++ b/clang/test/OpenMP/task_firstprivate_codegen.cpp @@ -13,6 +13,8 @@ // 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 32303cd..17b0de1 100644 --- a/clang/test/OpenMP/task_private_codegen.cpp +++ b/clang/test/OpenMP/task_private_codegen.cpp @@ -13,6 +13,8 @@ // 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 6472381..0aa9f3e 100644 --- a/clang/test/OpenMP/taskloop_firstprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_firstprivate_codegen.cpp @@ -13,7 +13,8 @@ // 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 1df56ac..6e65885 100644 --- a/clang/test/OpenMP/taskloop_lastprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_lastprivate_codegen.cpp @@ -15,7 +15,8 @@ // 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 01c387e..c7a85a4 100644 --- a/clang/test/OpenMP/taskloop_private_codegen.cpp +++ b/clang/test/OpenMP/taskloop_private_codegen.cpp @@ -13,6 +13,8 @@ // 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 935aacc..5f0b5de 100644 --- a/clang/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_simd_firstprivate_codegen.cpp @@ -13,7 +13,8 @@ // 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 97007dd..051c843 100644 --- a/clang/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp +++ b/clang/test/OpenMP/taskloop_simd_lastprivate_codegen.cpp @@ -13,7 +13,8 @@ // 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 29b9c83..2425d23 100644 --- a/clang/test/OpenMP/taskloop_simd_private_codegen.cpp +++ b/clang/test/OpenMP/taskloop_simd_private_codegen.cpp @@ -13,6 +13,8 @@ // 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 fb63836..8ab38e1 100644 --- a/clang/test/PCH/modified-header-error.c +++ b/clang/test/PCH/modified-header-error.c @@ -9,6 +9,4 @@ #include "header2.h" // CHECK: fatal error: file {{.*}} has been modified since the precompiled header {{.*}} was built - -// FIXME: Flaky on Windows, timestamp resolution? -// UNSUPPORTED: win32 +// REQUIRES: shell diff --git a/clang/test/Parser/crash-report.c b/clang/test/Parser/crash-report.c index 6ca1045..ef65b88 100644 --- a/clang/test/Parser/crash-report.c +++ b/clang/test/Parser/crash-report.c @@ -1,8 +1,9 @@ // 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: backtrace +// REQUIRES: shell, backtrace #prag\ ma clang __debug crash -- 2.7.4