[PATCH] D28002: [LLD] Use cpio -it instead of cpio -t

Rafael Avila de Espindola via llvm-commits llvm-commits at lists.llvm.org
Tue Dec 20 15:22:43 PST 2016


LGTM. Do you have commit access?

Mark Kettenis via Phabricator via llvm-commits
<llvm-commits at lists.llvm.org> writes:

> kettenis created this revision.
> kettenis added a reviewer: lld.
> kettenis added a subscriber: llvm-commits.
>
> OpenBSD's cpio does not accept the -t option without -i. 
> Apparently some systems implement cpio -t as a shortcut
> for cpio -it, the latter is the only thing that's documented.
> This change avoids test failures on OpenBSD.
>
>
> https://reviews.llvm.org/D28002
>
> Files:
>   test/ELF/reproduce-backslash.s
>   test/ELF/reproduce-windows.s
>   test/ELF/reproduce.s
>
>
> Index: test/ELF/reproduce.s
> ===================================================================
> --- test/ELF/reproduce.s
> +++ test/ELF/reproduce.s
> @@ -51,7 +51,7 @@
>  # RSP2-NEXT: -soname="foo bar"
>  # RSP2-NEXT: -soname="foo bar"
>  
> -# RUN: cpio -t < repro2.cpio | FileCheck %s
> +# RUN: cpio -it < repro2.cpio | FileCheck %s
>  # CHECK:      repro2/response.txt
>  # CHECK-NEXT: repro2/version.txt
>  # CHECK-NEXT: repro2/{{.*}}/dyn
> Index: test/ELF/reproduce-windows.s
> ===================================================================
> --- test/ELF/reproduce-windows.s
> +++ test/ELF/reproduce-windows.s
> @@ -6,7 +6,7 @@
>  # RUN: llvm-mc %s -o %t.dir/build/foo.o -filetype=obj -triple=x86_64-pc-linux
>  # RUN: cd %t.dir
>  # RUN: ld.lld build/foo.o --reproduce repro
> -# RUN: cpio -t < repro.cpio | FileCheck %s
> +# RUN: cpio -it < repro.cpio | FileCheck %s
>  
>  # CHECK: repro/response.txt
>  # CHECK: repro/{{.*}}/build/foo.o
> Index: test/ELF/reproduce-backslash.s
> ===================================================================
> --- test/ELF/reproduce-backslash.s
> +++ test/ELF/reproduce-backslash.s
> @@ -4,6 +4,6 @@
>  # legal for a filename to contain backslashes.
>  # RUN: llvm-mc %s -o foo\\.o -filetype=obj -triple=x86_64-pc-linux
>  # RUN: ld.lld foo\\.o --reproduce repro
> -# RUN: cpio -t < repro.cpio | FileCheck %s
> +# RUN: cpio -it < repro.cpio | FileCheck %s
>  
>  # CHECK: repro/{{.*}}/foo\.o
>
>
> Index: test/ELF/reproduce.s
> ===================================================================
> --- test/ELF/reproduce.s
> +++ test/ELF/reproduce.s
> @@ -51,7 +51,7 @@
>  # RSP2-NEXT: -soname="foo bar"
>  # RSP2-NEXT: -soname="foo bar"
>  
> -# RUN: cpio -t < repro2.cpio | FileCheck %s
> +# RUN: cpio -it < repro2.cpio | FileCheck %s
>  # CHECK:      repro2/response.txt
>  # CHECK-NEXT: repro2/version.txt
>  # CHECK-NEXT: repro2/{{.*}}/dyn
> Index: test/ELF/reproduce-windows.s
> ===================================================================
> --- test/ELF/reproduce-windows.s
> +++ test/ELF/reproduce-windows.s
> @@ -6,7 +6,7 @@
>  # RUN: llvm-mc %s -o %t.dir/build/foo.o -filetype=obj -triple=x86_64-pc-linux
>  # RUN: cd %t.dir
>  # RUN: ld.lld build/foo.o --reproduce repro
> -# RUN: cpio -t < repro.cpio | FileCheck %s
> +# RUN: cpio -it < repro.cpio | FileCheck %s
>  
>  # CHECK: repro/response.txt
>  # CHECK: repro/{{.*}}/build/foo.o
> Index: test/ELF/reproduce-backslash.s
> ===================================================================
> --- test/ELF/reproduce-backslash.s
> +++ test/ELF/reproduce-backslash.s
> @@ -4,6 +4,6 @@
>  # legal for a filename to contain backslashes.
>  # RUN: llvm-mc %s -o foo\\.o -filetype=obj -triple=x86_64-pc-linux
>  # RUN: ld.lld foo\\.o --reproduce repro
> -# RUN: cpio -t < repro.cpio | FileCheck %s
> +# RUN: cpio -it < repro.cpio | FileCheck %s
>  
>  # CHECK: repro/{{.*}}/foo\.o
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits


More information about the llvm-commits mailing list