[lld] r268598 - Merge two tests for the same purpose.

[Rui Ueyama via llvm-commits]

It is because FileCheck doesn't interpret and expand variables such as
"%:t" in "repro\%t:.dir\build\foo.o".

On Thu, May 5, 2016 at 6:18 AM, Rafael Espíndola <rafael.espindola at gmail.com
> wrote:

> Why grep and not FileCheck?
>
> Cheers,
> Rafael
>
>
> On 4 May 2016 at 22:32, Rui Ueyama via llvm-commits
> <llvm-commits at lists.llvm.org> wrote:
> > Author: ruiu
> > Date: Wed May  4 21:32:09 2016
> > New Revision: 268598
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=268598&view=rev
> > Log:
> > Merge two tests for the same purpose.
> >
> > I accidentally added another test file as I didn't notice
> > that the test file existed.
> >
> > Removed:
> >     lld/trunk/test/ELF/reproduce-win32.s
> > Modified:
> >     lld/trunk/test/ELF/reproduce-windows.s
> >
> > Removed: lld/trunk/test/ELF/reproduce-win32.s
> > URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/reproduce-win32.s?rev=268597&view=auto
> >
> ==============================================================================
> > --- lld/trunk/test/ELF/reproduce-win32.s (original)
> > +++ lld/trunk/test/ELF/reproduce-win32.s (removed)
> > @@ -1,12 +0,0 @@
> > -# REQUIRES: x86, system-windows
> > -
> > -# RUN: rm -rf %t.dir
> > -# RUN: mkdir -p %t.dir/build
> > -# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o
> %t.dir/build/foo.o
> > -# RUN: cd %t.dir
> > -# RUN: ld.lld --hash-style=gnu build/foo.o -o bar --reproduce repro
> > -# RUN: cpio -t < repro.cpio | grep -F 'repro\%:t.dir\build\foo.o' -
> > -
> > -.globl _start
> > -_start:
> > -  ret
> >
> > Modified: lld/trunk/test/ELF/reproduce-windows.s
> > URL:
> http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/reproduce-windows.s?rev=268598&r1=268597&r2=268598&view=diff
> >
> ==============================================================================
> > --- lld/trunk/test/ELF/reproduce-windows.s (original)
> > +++ lld/trunk/test/ELF/reproduce-windows.s Wed May  4 21:32:09 2016
> > @@ -1,8 +1,10 @@
> > -# REQUIRES: x86
> > +# REQUIRES: x86, system-windows
> >
> >  # Test that we can create a repro archive on windows.
> > -# RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
> > -# RUN: ld.lld --reproduce %t.repro %t.o -o t -shared
> > -# RUN: cpio -t < %t.repro.cpio | FileCheck %s
> > -# CHECK:      {{^[^/\\]*}}.repro{{/|\\}}response.txt
> > -# CHECK-NEXT: .repro{{/|\\}}{{.*}}.o
> > +# RUN: rm -rf %t.dir
> > +# RUN: mkdir -p %t.dir/build
> > +# RUN: llvm-mc %s -o %t.dir/build/foo.o -filetype=obj
> -triple=x86_64-pc-linux
> > +# RUN: cd %t.dir
> > +# RUN: not ld.lld build/foo.o --reproduce repro
> > +# RUN: cpio -t < repro.cpio | grep -F 'repro\response.txt'
> > +# RUN: cpio -t < repro.cpio | grep -F 'repro\%:t.dir\build\foo.o'
> >
> >
> > _______________________________________________
> > 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/20160505/283ecc5c/attachment.html>