<div dir="ltr"><div>Thanks.</div><div><br></div><div><div class="gmail_extra"><div class="gmail_quote">On Wed, Jun 6, 2018 at 11:00 AM, Hans Wennborg <span dir="ltr"><<a href="mailto:hans@chromium.org" target="_blank">hans@chromium.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The test was still failing in certain configurations, so I relaxed it<br>
in r334100.<br>
<div class="HOEnZb"><div class="h5"><br>
On Thu, May 31, 2018 at 7:48 AM, Joel E. Denny via llvm-commits<br>
<<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br>
> Author: jdenny<br>
> Date: Wed May 30 22:48:33 2018<br>
> New Revision: 333630<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=333630&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=333630&view=rev</a><br>
> Log:<br>
> [lit] Fix windows cmd.exe test config for r333620<br>
><br>
> Modified:<br>
>     llvm/trunk/utils/lit/tests/<wbr>lit.cfg<br>
>     llvm/trunk/utils/lit/tests/<wbr>shtest-run-at-line.py<br>
><br>
> Modified: llvm/trunk/utils/lit/tests/<wbr>lit.cfg<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/lit.cfg?rev=333630&r1=333629&r2=333630&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>tests/lit.cfg?rev=333630&r1=<wbr>333629&r2=333630&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/utils/lit/tests/<wbr>lit.cfg (original)<br>
> +++ llvm/trunk/utils/lit/tests/<wbr>lit.cfg Wed May 30 22:48:33 2018<br>
> @@ -78,7 +78,7 @@ config.environment['PATH'] = path<br>
>  isWin32CMDEXE = lit_config.isWindows and not lit_config.getBashPath()<br>
>  if isWin32CMDEXE:<br>
>      config.substitutions.append(('<wbr>%{pdbg0}', "echo '"))<br>
> -    config.substitutions.append(('<wbr>%{pdbg1}', "' > nul"))<br>
> +    config.substitutions.append(('<wbr>%{pdbg1}', "' > nul &&"))<br>
>  else:<br>
>      config.substitutions.append(('<wbr>%{pdbg0}', ": '"))<br>
> -    config.substitutions.append(('<wbr>%{pdbg1}', "'"))<br>
> +    config.substitutions.append(('<wbr>%{pdbg1}', "';"))<br>
><br>
> Modified: llvm/trunk/utils/lit/tests/<wbr>shtest-run-at-line.py<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/shtest-run-at-line.py?rev=333630&r1=333629&r2=333630&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>tests/shtest-run-at-line.py?<wbr>rev=333630&r1=333629&r2=<wbr>333630&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- llvm/trunk/utils/lit/tests/<wbr>shtest-run-at-line.py (original)<br>
> +++ llvm/trunk/utils/lit/tests/<wbr>shtest-run-at-line.py Wed May 30 22:48:33 2018<br>
> @@ -16,9 +16,9 @@<br>
>  # CHECK-LABEL: FAIL: shtest-run-at-line :: external-shell/basic.txt<br>
><br>
>  # CHECK:      Script:<br>
> -# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]];  true<br>
> -# CHECK-NEXT: [[pdbg0]]RUN: at line 5[[pdbg1]];  false<br>
> -# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]];  true<br>
> +# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]]  true<br>
> +# CHECK-NEXT: [[pdbg0]]RUN: at line 5[[pdbg1]]  false<br>
> +# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]]  true<br>
><br>
>  # CHECK:     RUN: at line 4<br>
>  # CHECK:     RUN: at line 5<br>
> @@ -27,9 +27,9 @@<br>
>  # CHECK-LABEL: FAIL: shtest-run-at-line :: external-shell/line-<wbr>continuation.txt<br>
><br>
>  # CHECK:      Script:<br>
> -# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]];  echo 'foo bar'  | FileCheck<br>
> -# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]];  echo  'foo baz'  | FileCheck<br>
> -# CHECK-NEXT: [[pdbg0]]RUN: at line 9[[pdbg1]];  echo 'foo bar'  | FileCheck<br>
> +# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]]  echo 'foo bar'  | FileCheck<br>
> +# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]]  echo  'foo baz'  | FileCheck<br>
> +# CHECK-NEXT: [[pdbg0]]RUN: at line 9[[pdbg1]]  echo 'foo bar'  | FileCheck<br>
><br>
>  # CHECK:     RUN: at line 4<br>
>  # CHECK:     RUN: at line 6<br>
><br>
><br>
> ______________________________<wbr>_________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div></div></div>