[llvm] r333630 - [lit] Fix windows cmd.exe test config for r333620

[Joel E. Denny via llvm-commits]

Thanks.

On Wed, Jun 6, 2018 at 11:00 AM, Hans Wennborg <hans at chromium.org> wrote:

> The test was still failing in certain configurations, so I relaxed it
> in r334100.
>
> On Thu, May 31, 2018 at 7:48 AM, Joel E. Denny via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
> > Author: jdenny
> > Date: Wed May 30 22:48:33 2018
> > New Revision: 333630
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=333630&view=rev
> > Log:
> > [lit] Fix windows cmd.exe test config for r333620
> >
> > Modified:
> >     llvm/trunk/utils/lit/tests/lit.cfg
> >     llvm/trunk/utils/lit/tests/shtest-run-at-line.py
> >
> > Modified: llvm/trunk/utils/lit/tests/lit.cfg
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/
> tests/lit.cfg?rev=333630&r1=333629&r2=333630&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/utils/lit/tests/lit.cfg (original)
> > +++ llvm/trunk/utils/lit/tests/lit.cfg Wed May 30 22:48:33 2018
> > @@ -78,7 +78,7 @@ config.environment['PATH'] = path
> >  isWin32CMDEXE = lit_config.isWindows and not lit_config.getBashPath()
> >  if isWin32CMDEXE:
> >      config.substitutions.append(('%{pdbg0}', "echo '"))
> > -    config.substitutions.append(('%{pdbg1}', "' > nul"))
> > +    config.substitutions.append(('%{pdbg1}', "' > nul &&"))
> >  else:
> >      config.substitutions.append(('%{pdbg0}', ": '"))
> > -    config.substitutions.append(('%{pdbg1}', "'"))
> > +    config.substitutions.append(('%{pdbg1}', "';"))
> >
> > Modified: llvm/trunk/utils/lit/tests/shtest-run-at-line.py
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/
> tests/shtest-run-at-line.py?rev=333630&r1=333629&r2=333630&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/utils/lit/tests/shtest-run-at-line.py (original)
> > +++ llvm/trunk/utils/lit/tests/shtest-run-at-line.py Wed May 30
> 22:48:33 2018
> > @@ -16,9 +16,9 @@
> >  # CHECK-LABEL: FAIL: shtest-run-at-line :: external-shell/basic.txt
> >
> >  # CHECK:      Script:
> > -# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]];  true
> > -# CHECK-NEXT: [[pdbg0]]RUN: at line 5[[pdbg1]];  false
> > -# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]];  true
> > +# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]]  true
> > +# CHECK-NEXT: [[pdbg0]]RUN: at line 5[[pdbg1]]  false
> > +# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]]  true
> >
> >  # CHECK:     RUN: at line 4
> >  # CHECK:     RUN: at line 5
> > @@ -27,9 +27,9 @@
> >  # CHECK-LABEL: FAIL: shtest-run-at-line :: external-shell/line-
> continuation.txt
> >
> >  # CHECK:      Script:
> > -# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]];  echo 'foo bar'  |
> FileCheck
> > -# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]];  echo  'foo baz'  |
> FileCheck
> > -# CHECK-NEXT: [[pdbg0]]RUN: at line 9[[pdbg1]];  echo 'foo bar'  |
> FileCheck
> > +# CHECK:      [[pdbg0]]RUN: at line 4[[pdbg1]]  echo 'foo bar'  |
> FileCheck
> > +# CHECK-NEXT: [[pdbg0]]RUN: at line 6[[pdbg1]]  echo  'foo baz'  |
> FileCheck
> > +# CHECK-NEXT: [[pdbg0]]RUN: at line 9[[pdbg1]]  echo 'foo bar'  |
> FileCheck
> >
> >  # CHECK:     RUN: at line 4
> >  # CHECK:     RUN: at line 6
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180606/28a69a2b/attachment.html>