<div dir="ltr">Hello Hans,<br><br>The test Driver/crash-report-modules.m still fails on one of windows builder:<br><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/10221">http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/10221</a><br><br>. . .<br>Failing Tests (1):<br> Clang :: Driver/crash-report-modules.m<br><br>Please have a look?<br><br>Thanks<br><br><div>Galina</div><div><br></div><div><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jun 12, 2018 at 4:51 AM, Hans Wennborg via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: hans<br>
Date: Tue Jun 12 04:51:22 2018<br>
New Revision: 334494<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=334494&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=334494&view=rev</a><br>
Log:<br>
Re-apply r334418 "Enable crash recovery tests on Windows, globs work in the lit internal shell now"<br>
<br>
Plus change run lines from<br>
<br>
not env FOO=bar %clang<br>
<br>
to<br>
<br>
env FOO=bar not %clang<br>
<br>
To not confuse the internal shell.<br>
<br>
Modified:<br>
cfe/trunk/test/Driver/crash-<wbr>report-header.h<br>
cfe/trunk/test/Driver/crash-<wbr>report-modules.m<br>
cfe/trunk/test/Driver/crash-<wbr>report-spaces.c<br>
cfe/trunk/test/Driver/crash-<wbr>report.c<br>
<br>
Modified: cfe/trunk/test/Driver/crash-<wbr>report-header.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report-header.h?rev=334494&r1=334493&r2=334494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>crash-report-header.h?rev=<wbr>334494&r1=334493&r2=334494&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/crash-<wbr>report-header.h (original)<br>
+++ cfe/trunk/test/Driver/crash-<wbr>report-header.h Tue Jun 12 04:51:22 2018<br>
@@ -1,13 +1,10 @@<br>
// RUN: rm -rf %t<br>
// RUN: mkdir %t<br>
-// RUN: not env TMPDIR="%t" TEMP="%t" TMP="%t" RC_DEBUG_OPTIONS=1 %clang -fsyntax-only %s 2>&1 | FileCheck %s<br>
+// RUN: env TMPDIR="%t" TEMP="%t" TMP="%t" RC_DEBUG_OPTIONS=1 not %clang -fsyntax-only %s 2>&1 | FileCheck %s<br>
// RUN: cat %t/crash-report-header-*.h | FileCheck --check-prefix=CHECKSRC "%s"<br>
// RUN: cat %t/crash-report-header-*.sh | FileCheck --check-prefix=CHECKSH "%s"<br>
// REQUIRES: crash-recovery<br>
<br>
-// because of the glob (*.h, *.sh)<br>
-// REQUIRES: shell<br>
-<br>
#pragma clang __debug parser_crash<br>
// CHECK: Preprocessed source(s) and associated run script(s) are located at:<br>
// CHECK-NEXT: note: diagnostic msg: {{.*}}.h<br>
<br>
Modified: cfe/trunk/test/Driver/crash-<wbr>report-modules.m<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report-modules.m?rev=334494&r1=334493&r2=334494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>crash-report-modules.m?rev=<wbr>334494&r1=334493&r2=334494&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/crash-<wbr>report-modules.m (original)<br>
+++ cfe/trunk/test/Driver/crash-<wbr>report-modules.m Tue Jun 12 04:51:22 2018<br>
@@ -1,20 +1,14 @@<br>
// RUN: rm -rf %t<br>
// RUN: mkdir -p %t/i %t/m %t<br>
<br>
-// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \<br>
-// RUN: %clang -fsyntax-only %s -I %S/Inputs/module -isysroot %/t/i/ \<br>
+// RUN: env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \<br>
+// RUN: not %clang -fsyntax-only %s -I %S/Inputs/module -isysroot %/t/i/ \<br>
// RUN: -fmodules -fmodules-cache-path=%t/m/ -DFOO=BAR 2>&1 | FileCheck %s<br>
<br>
// RUN: FileCheck --check-prefix=CHECKSRC %s -input-file %t/crash-report-*.m<br>
// RUN: FileCheck --check-prefix=CHECKSH %s -input-file %t/crash-report-*.sh<br>
// REQUIRES: crash-recovery<br>
<br>
-// because of the glob (*.m, *.sh)<br>
-// REQUIRES: shell<br>
-<br>
-// FIXME: This XFAIL is cargo-culted from crash-report.c. Do we need it?<br>
-// XFAIL: mingw32<br>
-<br>
@import simple;<br>
const int x = MODULE_MACRO;<br>
<br>
@@ -34,4 +28,4 @@ const int x = MODULE_MACRO;<br>
// CHECKSH: "-D" "FOO=BAR"<br>
// CHECKSH-NOT: "-fmodules-cache-path="<br>
// CHECKSH: "crash-report-modules-{{[^ ]*}}.m"<br>
-// CHECKSH: "-ivfsoverlay" "crash-report-modules-{{[^ ]*}}.cache/vfs/vfs.yaml"<br>
+// CHECKSH: "-ivfsoverlay" "crash-report-modules-{{[^ ]*}}.cache{{(/|\\\\)}}vfs{{(/|<wbr>\\\\)}}vfs.yaml"<br>
<br>
Modified: cfe/trunk/test/Driver/crash-<wbr>report-spaces.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report-spaces.c?rev=334494&r1=334493&r2=334494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>crash-report-spaces.c?rev=<wbr>334494&r1=334493&r2=334494&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/crash-<wbr>report-spaces.c (original)<br>
+++ cfe/trunk/test/Driver/crash-<wbr>report-spaces.c Tue Jun 12 04:51:22 2018<br>
@@ -1,14 +1,11 @@<br>
// RUN: rm -rf "%t"<br>
// RUN: mkdir "%t"<br>
// RUN: cp "%s" "%t/crash report spaces.c"<br>
-// RUN: not env TMPDIR="%t" TEMP="%t" TMP="%t" RC_DEBUG_OPTIONS=1 %clang -fsyntax-only "%t/crash report spaces.c" 2>&1 | FileCheck "%s"<br>
+// RUN: env TMPDIR="%t" TEMP="%t" TMP="%t" RC_DEBUG_OPTIONS=1 not %clang -fsyntax-only "%t/crash report spaces.c" 2>&1 | FileCheck "%s"<br>
// RUN: cat "%t/crash report spaces"-*.c | FileCheck --check-prefix=CHECKSRC "%s"<br>
// RUN: cat "%t/crash report spaces"-*.sh | FileCheck --check-prefix=CHECKSH "%s"<br>
// REQUIRES: crash-recovery<br>
<br>
-// because of the glob (*.c, *.sh)<br>
-// REQUIRES: shell<br>
-<br>
#pragma clang __debug parser_crash<br>
// CHECK: Preprocessed source(s) and associated run script(s) are located at:<br>
// CHECK-NEXT: note: diagnostic msg: {{.*}}.c<br>
<br>
Modified: cfe/trunk/test/Driver/crash-<wbr>report.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/crash-report.c?rev=334494&r1=334493&r2=334494&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>crash-report.c?rev=334494&r1=<wbr>334493&r2=334494&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/crash-<wbr>report.c (original)<br>
+++ cfe/trunk/test/Driver/crash-<wbr>report.c Tue Jun 12 04:51:22 2018<br>
@@ -1,8 +1,8 @@<br>
// RUN: rm -rf %t<br>
// RUN: mkdir %t<br>
-// RUN: not env TMPDIR=%t TEMP=%t TMP=%t RC_DEBUG_OPTIONS=1 \<br>
+// RUN: env TMPDIR=%t TEMP=%t TMP=%t RC_DEBUG_OPTIONS=1 \<br>
// RUN: CC_PRINT_HEADERS=1 CC_LOG_DIAGNOSTICS=1 \<br>
-// RUN: %clang -fsyntax-only %s \<br>
+// RUN: not %clang -fsyntax-only %s \<br>
// RUN: -F/tmp/ -I /tmp/ -idirafter /tmp/ -iquote /tmp/ -isystem /tmp/ \<br>
// RUN: -iprefix /the/prefix -iwithprefix /tmp -iwithprefixbefore /tmp/ \<br>
// RUN: -Xclang -internal-isystem -Xclang /tmp/ \<br>
@@ -13,9 +13,6 @@<br>
// RUN: cat %t/crash-report-*.sh | FileCheck --check-prefix=CHECKSH %s<br>
// REQUIRES: crash-recovery<br>
<br>
-// because of the glob (*.c, *.sh)<br>
-// REQUIRES: shell<br>
-<br>
#pragma clang __debug parser_crash<br>
// CHECK: Preprocessed source(s) and associated run script(s) are located at:<br>
// CHECK-NEXT: note: diagnostic msg: {{.*}}crash-report-{{.*}}.c<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>