From: Yaron Keren Date: Sun, 26 Jul 2015 04:36:39 +0000 (+0000) Subject: Enable passing clang tests on Windows/MSYS. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b17944708d47fc0acc018287dcd4c70fbcefbbf3;p=clang Enable passing clang tests on Windows/MSYS. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@243236 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Driver/cl-response-file.c b/test/Driver/cl-response-file.c index c57f34b315..9b387b0276 100644 --- a/test/Driver/cl-response-file.c +++ b/test/Driver/cl-response-file.c @@ -1,6 +1,3 @@ -// Don't attempt slash switches on msys bash. -// REQUIRES: shell-preserves-root - // Test that we use the Windows tokenizer for clang-cl response files. The // trailing backslash before the space should be interpreted as a literal // backslash. PR23709 diff --git a/test/Driver/crash-report-header.h b/test/Driver/crash-report-header.h index e0193cbe45..3580b60029 100644 --- a/test/Driver/crash-report-header.h +++ b/test/Driver/crash-report-header.h @@ -5,9 +5,6 @@ // RUN: cat %t/crash-report-header-*.sh | FileCheck --check-prefix=CHECKSH "%s" // REQUIRES: crash-recovery -// because of the glob (*.h, *.sh) -// REQUIRES: shell - #pragma clang __debug parser_crash // CHECK: Preprocessed source(s) and associated run script(s) are located at: // CHECK-NEXT: note: diagnostic msg: {{.*}}.h diff --git a/test/Driver/crash-report-modules.m b/test/Driver/crash-report-modules.m index 0e1d81a1f3..9dd3b74e69 100644 --- a/test/Driver/crash-report-modules.m +++ b/test/Driver/crash-report-modules.m @@ -9,11 +9,7 @@ // RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-report-*.sh // REQUIRES: crash-recovery -// because of the glob (*.m, *.sh) -// REQUIRES: shell - -// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it? -// XFAIL: mingw32 +// XFAIL: windows,win32 @import simple; const int x = MODULE_MACRO; diff --git a/test/Driver/crash-report.c b/test/Driver/crash-report.c index 38813e3bb8..2e45d8ce1c 100644 --- a/test/Driver/crash-report.c +++ b/test/Driver/crash-report.c @@ -11,9 +11,6 @@ // RUN: cat %t/crash-report-*.sh | FileCheck --check-prefix=CHECKSH %s // REQUIRES: crash-recovery -// because of the glob (*.c, *.sh) -// REQUIRES: shell - #pragma clang __debug parser_crash // CHECK: Preprocessed source(s) and associated run script(s) are located at: // CHECK-NEXT: note: diagnostic msg: {{.*}}crash-report-{{.*}}.c diff --git a/test/Driver/darwin-debug-flags.c b/test/Driver/darwin-debug-flags.c index 5080a59e94..6ba3745230 100644 --- a/test/Driver/darwin-debug-flags.c +++ b/test/Driver/darwin-debug-flags.c @@ -16,6 +16,3 @@ int x; // S: "-dwarf-debug-flags" // P: "-dwarf-debug-producer" - -// This depends on shell quoting. -// REQUIRES: shell diff --git a/test/Driver/env.c b/test/Driver/env.c index f243fa641c..0371bc91c4 100644 --- a/test/Driver/env.c +++ b/test/Driver/env.c @@ -1,6 +1,6 @@ // These tests try to ensure that the driver operates reasonably when run with // a strange environment. Unfortunately, it requires a normal shell and the -// 'env' command. +// 'env' command that understands arguments, unlike the LIT built-in env. // // REQUIRES: shell // The PATH variable is heavily used when trying to find a linker. diff --git a/test/Driver/no-canonical-prefixes.c b/test/Driver/no-canonical-prefixes.c index 1aef9f40a9..b617cd4e36 100644 --- a/test/Driver/no-canonical-prefixes.c +++ b/test/Driver/no-canonical-prefixes.c @@ -1,3 +1,4 @@ +// Due to ln -sf: // REQUIRES: shell // RUN: mkdir -p %t // RUN: cd %t diff --git a/test/Driver/rewrite-map-in-diagnostics.c b/test/Driver/rewrite-map-in-diagnostics.c index 4aea0ec031..7c5811539e 100644 --- a/test/Driver/rewrite-map-in-diagnostics.c +++ b/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