r334494 - Re-apply r334418 "Enable crash recovery tests on Windows, globs work in the lit internal shell now"
Galina Kistanova via cfe-commits
cfe-commits at lists.llvm.org
Tue Jun 12 13:30:34 PDT 2018
Hello Hans,
The test Driver/crash-report-modules.m still fails on one of windows
builder:
http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/10221
. . .
Failing Tests (1):
Clang :: Driver/crash-report-modules.m
Please have a look?
Thanks
Galina
On Tue, Jun 12, 2018 at 4:51 AM, Hans Wennborg via cfe-commits <
cfe-commits at lists.llvm.org> wrote:
> Author: hans
> Date: Tue Jun 12 04:51:22 2018
> New Revision: 334494
>
> URL: http://llvm.org/viewvc/llvm-project?rev=334494&view=rev
> Log:
> Re-apply r334418 "Enable crash recovery tests on Windows, globs work in
> the lit internal shell now"
>
> Plus change run lines from
>
> not env FOO=bar %clang
>
> to
>
> env FOO=bar not %clang
>
> To not confuse the internal shell.
>
> 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=334494&r1=334493&r2=334494&view=diff
> ============================================================
> ==================
> --- cfe/trunk/test/Driver/crash-report-header.h (original)
> +++ cfe/trunk/test/Driver/crash-report-header.h Tue Jun 12 04:51:22 2018
> @@ -1,13 +1,10 @@
> // RUN: rm -rf %t
> // RUN: mkdir %t
> -// RUN: not env TMPDIR="%t" TEMP="%t" TMP="%t" RC_DEBUG_OPTIONS=1 %clang
> -fsyntax-only %s 2>&1 | FileCheck %s
> +// RUN: env TMPDIR="%t" TEMP="%t" TMP="%t" RC_DEBUG_OPTIONS=1 not %clang
> -fsyntax-only %s 2>&1 | FileCheck %s
> // RUN: cat %t/crash-report-header-*.h | FileCheck
> --check-prefix=CHECKSRC "%s"
> // 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=334494&r1=334493&r2=334494&view=diff
> ============================================================
> ==================
> --- cfe/trunk/test/Driver/crash-report-modules.m (original)
> +++ cfe/trunk/test/Driver/crash-report-modules.m Tue Jun 12 04:51:22 2018
> @@ -1,20 +1,14 @@
> // RUN: rm -rf %t
> // RUN: mkdir -p %t/i %t/m %t
>
> -// RUN: not env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
> -// RUN: %clang -fsyntax-only %s -I %S/Inputs/module -isysroot %/t/i/ \
> +// RUN: env FORCE_CLANG_DIAGNOSTICS_CRASH= TMPDIR=%t TEMP=%t TMP=%t \
> +// RUN: not %clang -fsyntax-only %s -I %S/Inputs/module -isysroot %/t/i/ \
> // RUN: -fmodules -fmodules-cache-path=%t/m/ -DFOO=BAR 2>&1 | FileCheck %s
>
> // RUN: FileCheck --check-prefix=CHECKSRC %s -input-file
> %t/crash-report-*.m
> // 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;
>
> @@ -34,4 +28,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=334494&r1=334493&r2=334494&view=diff
> ============================================================
> ==================
> --- cfe/trunk/test/Driver/crash-report-spaces.c (original)
> +++ cfe/trunk/test/Driver/crash-report-spaces.c Tue Jun 12 04:51:22 2018
> @@ -1,14 +1,11 @@
> // RUN: rm -rf "%t"
> // RUN: mkdir "%t"
> // RUN: cp "%s" "%t/crash report spaces.c"
> -// 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"
> +// 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"
> // RUN: cat "%t/crash report spaces"-*.c | FileCheck
> --check-prefix=CHECKSRC "%s"
> // 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=334494&r1=334493&r2=334494&view=diff
> ============================================================
> ==================
> --- cfe/trunk/test/Driver/crash-report.c (original)
> +++ cfe/trunk/test/Driver/crash-report.c Tue Jun 12 04:51:22 2018
> @@ -1,8 +1,8 @@
> // RUN: rm -rf %t
> // RUN: mkdir %t
> -// RUN: not env TMPDIR=%t TEMP=%t TMP=%t RC_DEBUG_OPTIONS=1 \
> +// RUN: env TMPDIR=%t TEMP=%t TMP=%t RC_DEBUG_OPTIONS=1 \
> // RUN: CC_PRINT_HEADERS=1 CC_LOG_DIAGNOSTICS=1 \
> -// RUN: %clang -fsyntax-only %s \
> +// RUN: not %clang -fsyntax-only %s \
> // RUN: -F/tmp/ -I /tmp/ -idirafter /tmp/ -iquote /tmp/ -isystem /tmp/ \
> // RUN: -iprefix /the/prefix -iwithprefix /tmp -iwithprefixbefore /tmp/ \
> // RUN: -Xclang -internal-isystem -Xclang /tmp/ \
> @@ -13,9 +13,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
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180612/098bcd61/attachment-0001.html>
More information about the cfe-commits
mailing list