From bdeedc78d8c9fa101eab2cc299bb4dae27349115 Mon Sep 17 00:00:00 2001
From: Renato Golin <renato.golin@linaro.org>
Date: Mon, 14 Nov 2016 13:09:24 +0000
Subject: [PATCH] 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).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@286820 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/llvm-strings/archive-filename.test | 10 ---------
 test/tools/llvm-strings/file-filename.test    |  4 ----
 test/tools/llvm-strings/nested-archives.test  |  4 ++--
 test/tools/llvm-strings/stdin-filename.test   |  3 ---
 tools/llvm-strings/llvm-strings.cpp           | 21 ++++---------------
 5 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 test/tools/llvm-strings/archive-filename.test
 delete mode 100644 test/tools/llvm-strings/file-filename.test
 delete mode 100644 test/tools/llvm-strings/stdin-filename.test

diff --git a/test/tools/llvm-strings/archive-filename.test b/test/tools/llvm-strings/archive-filename.test
deleted file mode 100644
index a07e2158763..00000000000
--- a/test/tools/llvm-strings/archive-filename.test
+++ /dev/null
@@ -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
-
diff --git a/test/tools/llvm-strings/file-filename.test b/test/tools/llvm-strings/file-filename.test
deleted file mode 100644
index 5e77aeb73d3..00000000000
--- a/test/tools/llvm-strings/file-filename.test
+++ /dev/null
@@ -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
diff --git a/test/tools/llvm-strings/nested-archives.test b/test/tools/llvm-strings/nested-archives.test
index 1271446fb89..c3a95f2fd60 100644
--- a/test/tools/llvm-strings/nested-archives.test
+++ b/test/tools/llvm-strings/nested-archives.test
@@ -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>
diff --git a/test/tools/llvm-strings/stdin-filename.test b/test/tools/llvm-strings/stdin-filename.test
deleted file mode 100644
index 405a64adb31..00000000000
--- a/test/tools/llvm-strings/stdin-filename.test
+++ /dev/null
@@ -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
diff --git a/tools/llvm-strings/llvm-strings.cpp b/tools/llvm-strings/llvm-strings.cpp
index cb0fb9651d9..6e5e2f298c3 100644
--- a/tools/llvm-strings/llvm-strings.cpp
+++ b/tools/llvm-strings/llvm-strings.cpp
@@ -29,19 +29,7 @@ static cl::list<std::string> InputFileNames(cl::Positional,
                                             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, StringRef FileName, StringRef Contents) {
         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;
-- 
2.40.0