[llvm] r286820 - Revert "llvm-strings: support printing the filename"
Vedant Kumar via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 14 13:01:29 PST 2016
If it helps, here is what we were seeing on some bots:
$ ./bin/llvm-strings Build/test/tools/llvm-strings/Output/outer.a
!<arch>
#1/12 0 0 0 644 88 `
inner.a
!<arch>
#1/4 0 0 0 644 8 `
abcdabcd
Lit output:
--
Exit Code: 1
Command Output (stderr):
--
/Users/buildslave/jenkins/sharedspace/apple-clang-stage1 at 2/clang/src/test/tools/llvm-strings/nested-archives.test:9:8: error: expected string not found in input
CHECK: inner.a/ 0 0 0 644 72 `
^
<stdin>:2:1: note: scanning from here
#1/12 0 0 0 644 88 `
^
--
vedant
> On Nov 14, 2016, at 5:09 AM, Renato Golin via llvm-commits <llvm-commits at lists.llvm.org> wrote:
>
> Author: rengolin
> Date: Mon Nov 14 07:09:24 2016
> New Revision: 286820
>
> URL: http://llvm.org/viewvc/llvm-project?rev=286820&view=rev
> Log:
> Revert "llvm-strings: support printing the filename"
>
> Also,
>
> Revert "test: remove the archive before modifying it"
> Revert "test: explicitly use gnu format"
>
> This reverts commits r286778, r286729 and r286767, as they are randomly failing
> on many bots (AArch64, x86_64).
>
> Removed:
> llvm/trunk/test/tools/llvm-strings/archive-filename.test
> llvm/trunk/test/tools/llvm-strings/file-filename.test
> llvm/trunk/test/tools/llvm-strings/stdin-filename.test
> Modified:
> llvm/trunk/test/tools/llvm-strings/nested-archives.test
> llvm/trunk/tools/llvm-strings/llvm-strings.cpp
>
> Removed: llvm/trunk/test/tools/llvm-strings/archive-filename.test
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/archive-filename.test?rev=286819&view=auto
> ==============================================================================
> --- llvm/trunk/test/tools/llvm-strings/archive-filename.test (original)
> +++ llvm/trunk/test/tools/llvm-strings/archive-filename.test (removed)
> @@ -1,10 +0,0 @@
> -RUN: echo -n abcd > %T/abcd
> -RUN: rm -f %T/archive.a
> -RUN: llvm-ar -format gnu crs %T/archive.a %T/abcd
> -RUN: llvm-strings -f %T/archive.a | FileCheck %s
> -RUN: llvm-strings --print-file-name %T/archive.a | FileCheck %s
> -
> -CHECK: archive.a: !<arch>
> -CHECK: archive.a: abcd/ 0 0 0 644 4 `
> -CHECK: archive.a: abcd
> -
>
> Removed: llvm/trunk/test/tools/llvm-strings/file-filename.test
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/file-filename.test?rev=286819&view=auto
> ==============================================================================
> --- llvm/trunk/test/tools/llvm-strings/file-filename.test (original)
> +++ llvm/trunk/test/tools/llvm-strings/file-filename.test (removed)
> @@ -1,4 +0,0 @@
> -RUN: echo -n abcd > %T/abcd
> -RUN: llvm-strings -f %T/abcd | FileCheck %s
> -RUN: llvm-strings --print-file-name %T/abcd | FileCheck %s
> -CHECK: {{[\\/]}}abcd: abcd
>
> Modified: llvm/trunk/test/tools/llvm-strings/nested-archives.test
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/nested-archives.test?rev=286820&r1=286819&r2=286820&view=diff
> ==============================================================================
> --- llvm/trunk/test/tools/llvm-strings/nested-archives.test (original)
> +++ llvm/trunk/test/tools/llvm-strings/nested-archives.test Mon Nov 14 07:09:24 2016
> @@ -1,8 +1,8 @@
> RUN: echo -n abcd > %T/abcd
> RUN: rm -f %T/inner.ar
> -RUN: llvm-ar -format gnu crs %T/inner.a %T/abcd
> +RUN: llvm-ar crs %T/inner.a %T/abcd
> RUN: rm -f %T/outer.ar
> -RUN: llvm-ar -format gnu crs %T/outer.a %T/inner.a
> +RUN: llvm-ar crs %T/outer.a %T/inner.a
> RUN: llvm-strings %T/outer.a | FileCheck %s
>
> CHECK: !<arch>
>
> Removed: llvm/trunk/test/tools/llvm-strings/stdin-filename.test
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/stdin-filename.test?rev=286819&view=auto
> ==============================================================================
> --- llvm/trunk/test/tools/llvm-strings/stdin-filename.test (original)
> +++ llvm/trunk/test/tools/llvm-strings/stdin-filename.test (removed)
> @@ -1,3 +0,0 @@
> -RUN: echo -n abcd | llvm-strings -f - | FileCheck %s
> -RUN: echo -n abcd | llvm-strings --print-file-name - | FileCheck %s
> -CHECK: {standard input}: abcd
>
> Modified: llvm/trunk/tools/llvm-strings/llvm-strings.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-strings/llvm-strings.cpp?rev=286820&r1=286819&r2=286820&view=diff
> ==============================================================================
> --- llvm/trunk/tools/llvm-strings/llvm-strings.cpp (original)
> +++ llvm/trunk/tools/llvm-strings/llvm-strings.cpp Mon Nov 14 07:09:24 2016
> @@ -29,19 +29,7 @@ static cl::list<std::string> InputFileNa
> cl::desc("<input object files>"),
> cl::ZeroOrMore);
>
> -static cl::opt<bool>
> - PrintFileName("print-file-name",
> - cl::desc("Print the name of the file before each string"));
> -static cl::alias PrintFileNameShort("f", cl::desc(""),
> - cl::aliasopt(PrintFileName));
> -
> -static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
> - auto print = [&OS, FileName](StringRef L) {
> - if (PrintFileName)
> - OS << FileName << ": ";
> - OS << L << '\n';
> - };
> -
> +static void strings(raw_ostream &OS, StringRef Contents) {
> const char *P = nullptr, *E = nullptr, *S = nullptr;
> for (P = Contents.begin(), E = Contents.end(); P < E; ++P) {
> if (std::isgraph(*P) || std::isblank(*P)) {
> @@ -49,12 +37,12 @@ static void strings(raw_ostream &OS, Str
> S = P;
> } else if (S) {
> if (P - S > 3)
> - print(StringRef(S, P - S));
> + OS << StringRef(S, P - S) << '\n';
> S = nullptr;
> }
> }
> if (S && E - S > 3)
> - print(StringRef(S, E - S));
> + OS << StringRef(S, E - S) << '\n';
> }
>
> int main(int argc, char **argv) {
> @@ -72,8 +60,7 @@ int main(int argc, char **argv) {
> if (std::error_code EC = Buffer.getError())
> errs() << File << ": " << EC.message() << '\n';
> else
> - strings(llvm::outs(), File == "-" ? "{standard input}" : File,
> - Buffer.get()->getMemBufferRef().getBuffer());
> + strings(llvm::outs(), Buffer.get()->getMemBufferRef().getBuffer());
> }
>
> return EXIT_SUCCESS;
>
>
> _______________________________________________
> 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