Revert "Revert "llvm-strings: support printing the filename""
Change the dynamic files to static in the hope that it will actually fix the
transient errors that Ive been unable to reproduce.
llvm-svn: 286891
diff --git a/llvm/test/tools/llvm-strings/Inputs/abcd b/llvm/test/tools/llvm-strings/Inputs/abcd
new file mode 100644
index 0000000..85df507
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/Inputs/abcd
@@ -0,0 +1 @@
+abcd
\ No newline at end of file
diff --git a/llvm/test/tools/llvm-strings/archive-filename.test b/llvm/test/tools/llvm-strings/archive-filename.test
new file mode 100644
index 0000000..1c7b468
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/archive-filename.test
@@ -0,0 +1,9 @@
+RUN: rm -f %T/archive.a
+RUN: llvm-ar -format gnu crs %T/archive.a %S/Inputs/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/llvm/test/tools/llvm-strings/file-filename.test b/llvm/test/tools/llvm-strings/file-filename.test
new file mode 100644
index 0000000..de0ce97
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/file-filename.test
@@ -0,0 +1,3 @@
+RUN: llvm-strings -f %S/Inputs/abcd | FileCheck %s
+RUN: llvm-strings --print-file-name %S/Inputs/abcd | FileCheck %s
+CHECK: {{[\\/]}}abcd: abcd
diff --git a/llvm/test/tools/llvm-strings/nested-archives.test b/llvm/test/tools/llvm-strings/nested-archives.test
index c3a95f2..09ad004 100644
--- a/llvm/test/tools/llvm-strings/nested-archives.test
+++ b/llvm/test/tools/llvm-strings/nested-archives.test
@@ -1,8 +1,7 @@
-RUN: echo -n abcd > %T/abcd
RUN: rm -f %T/inner.ar
-RUN: llvm-ar crs %T/inner.a %T/abcd
+RUN: llvm-ar -format gnu crs %T/inner.a %S/Inputs/abcd
RUN: rm -f %T/outer.ar
-RUN: llvm-ar crs %T/outer.a %T/inner.a
+RUN: llvm-ar -format gnu crs %T/outer.a %T/inner.a
RUN: llvm-strings %T/outer.a | FileCheck %s
CHECK: !<arch>
diff --git a/llvm/test/tools/llvm-strings/stdin-filename.test b/llvm/test/tools/llvm-strings/stdin-filename.test
new file mode 100644
index 0000000..9c87e5c
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/stdin-filename.test
@@ -0,0 +1,3 @@
+RUN: echo abcd | llvm-strings -f - | FileCheck %s
+RUN: echo abcd | llvm-strings --print-file-name - | FileCheck %s
+CHECK: {standard input}: abcd