Author: hans Date: Tue Jun 12 04:33:44 2018 New Revision: 334493 URL: http://llvm.org/viewvc/llvm-project?rev=334493&view=rev Log: Revert r334418 "Enable crash recovery tests on Windows, globs work in the lit internal shell now"
The tests fail on Windows bots, and for me locally. > Enable crash recovery tests on Windows, globs work in the lit internal shell > now Modified: cfe/trunk/test/Driver/crash-report-header.h cfe/trunk/test/Driver/crash-report-modules.m cfe/trunk/test/Driver/crash-report-spaces.c cfe/trunk/test/Driver/crash-report.c Modified: cfe/trunk/test/Driver/crash-report-header.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report-header.h?rev=334493&r1=334492&r2=334493&view=diff ============================================================================== --- cfe/trunk/test/Driver/crash-report-header.h (original) +++ cfe/trunk/test/Driver/crash-report-header.h Tue Jun 12 04:33:44 2018 @@ -5,6 +5,9 @@ // 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 Modified: cfe/trunk/test/Driver/crash-report-modules.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report-modules.m?rev=334493&r1=334492&r2=334493&view=diff ============================================================================== --- cfe/trunk/test/Driver/crash-report-modules.m (original) +++ cfe/trunk/test/Driver/crash-report-modules.m Tue Jun 12 04:33:44 2018 @@ -9,6 +9,12 @@ // 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 + @import simple; const int x = MODULE_MACRO; @@ -28,4 +34,4 @@ const int x = MODULE_MACRO; // CHECKSH: "-D" "FOO=BAR" // CHECKSH-NOT: "-fmodules-cache-path=" // CHECKSH: "crash-report-modules-{{[^ ]*}}.m" -// CHECKSH: "-ivfsoverlay" "crash-report-modules-{{[^ ]*}}.cache{{(/|\\\\)}}vfs{{(/|\\\\)}}vfs.yaml" +// CHECKSH: "-ivfsoverlay" "crash-report-modules-{{[^ ]*}}.cache/vfs/vfs.yaml" Modified: cfe/trunk/test/Driver/crash-report-spaces.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report-spaces.c?rev=334493&r1=334492&r2=334493&view=diff ============================================================================== --- cfe/trunk/test/Driver/crash-report-spaces.c (original) +++ cfe/trunk/test/Driver/crash-report-spaces.c Tue Jun 12 04:33:44 2018 @@ -6,6 +6,9 @@ // RUN: cat "%t/crash report spaces"-*.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: {{.*}}.c Modified: cfe/trunk/test/Driver/crash-report.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report.c?rev=334493&r1=334492&r2=334493&view=diff ============================================================================== --- cfe/trunk/test/Driver/crash-report.c (original) +++ cfe/trunk/test/Driver/crash-report.c Tue Jun 12 04:33:44 2018 @@ -13,6 +13,9 @@ // 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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits