diff options
author | Fangrui Song <maskray@google.com> | 2019-11-06 10:19:30 -0800 |
---|---|---|
committer | Fangrui Song <maskray@google.com> | 2019-11-07 09:26:31 -0800 |
commit | 7d2b0ec345487537e37a24b323d612c7c06295cd (patch) | |
tree | b421fa7abeb9dff7a2d52342169cf7b276ae5256 | |
parent | f8622543ad07f57618c9ecdb3b3a8c7cabe40b85 (diff) | |
download | bcm5719-llvm-7d2b0ec345487537e37a24b323d612c7c06295cd.tar.gz bcm5719-llvm-7d2b0ec345487537e37a24b323d612c7c06295cd.zip |
[llvm-ar] Support verbose mode for operation 'x'
Reviewed By: jhenderson, kongyi
Differential Revision: https://reviews.llvm.org/D69911
-rw-r--r-- | llvm/test/tools/llvm-ar/extract.test | 15 | ||||
-rw-r--r-- | llvm/tools/llvm-ar/llvm-ar.cpp | 6 |
2 files changed, 17 insertions, 4 deletions
diff --git a/llvm/test/tools/llvm-ar/extract.test b/llvm/test/tools/llvm-ar/extract.test index a2059d1ba9e..278a89db005 100644 --- a/llvm/test/tools/llvm-ar/extract.test +++ b/llvm/test/tools/llvm-ar/extract.test @@ -5,18 +5,27 @@ RUN: rm -rf %t && mkdir -p %t/extracted/ # Extracting from an empty archive should not warn or error: RUN: llvm-ar cr %t/empty.a -RUN: llvm-ar x %t/empty.a 2>&1 | count 0 +RUN: llvm-ar xv %t/empty.a 2>&1 | count 0 RUN: echo filea > %t/a.txt RUN: echo fileb > %t/b.txt RUN: llvm-ar rc %t/archive.a %t/a.txt %t/b.txt # Single member: -RUN: cd %t/extracted && llvm-ar x %t/archive.a a.txt +RUN: cd %t/extracted && llvm-ar xv %t/archive.a a.txt | FileCheck %s --check-prefix=A RUN: diff %t/a.txt %t/extracted/a.txt +A: x - a.txt # All members: RUN: rm %t/extracted/a.txt -RUN: cd %t/extracted && llvm-ar x %t/archive.a +RUN: cd %t/extracted && llvm-ar xv %t/archive.a | FileCheck %s --check-prefix=AB RUN: diff %t/a.txt %t/extracted/a.txt RUN: diff %t/b.txt %t/extracted/b.txt +AB: x - a.txt +AB: x - b.txt + +# No output if 'v' is not specified. +RUN: rm a.txt b.txt +RUN: llvm-ar x %t/archive.a 2>&1 | count 0 +RUN: diff %t/a.txt %t/extracted/a.txt +RUN: diff %t/b.txt %t/extracted/b.txt diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp index c70b8814b28..18cad21f964 100644 --- a/llvm/tools/llvm-ar/llvm-ar.cpp +++ b/llvm/tools/llvm-ar/llvm-ar.cpp @@ -530,8 +530,12 @@ static void doExtract(StringRef Name, const object::Archive::Child &C) { failIfError(ModeOrErr.takeError()); sys::fs::perms Mode = ModeOrErr.get(); + llvm::StringRef outputFilePath = sys::path::filename(Name); + if (Verbose) + outs() << "x - " << outputFilePath << '\n'; + int FD; - failIfError(sys::fs::openFileForWrite(sys::path::filename(Name), FD, + failIfError(sys::fs::openFileForWrite(outputFilePath, FD, sys::fs::CD_CreateAlways, sys::fs::OF_None, Mode), Name); |