1 files changed, 45 insertions, 32 deletions
diff --git a/llvm/test/tools/llvm-strings/radix-filename.test b/llvm/test/tools/llvm-strings/radix-filename.test
index 60d78da2a13..d8c3b7aad6b 100644
--- a/llvm/test/tools/llvm-strings/radix-filename.test
+++ b/llvm/test/tools/llvm-strings/radix-filename.test
@@ -1,36 +1,49 @@
-RUN: llvm-strings --print-file-name %S/Inputs/numbers \
-RUN:     | FileCheck %s --check-prefix CHECK-NONE
-RUN: llvm-strings --print-file-name -t d %S/Inputs/numbers \
-RUN:    | FileCheck %s --check-prefix CHECK-DEC --strict-whitespace
-RUN: llvm-strings --print-file-name -t o %S/Inputs/numbers \
-RUN:     | FileCheck %s --check-prefix CHECK-OCT --strict-whitespace
-RUN: llvm-strings --print-file-name -t x %S/Inputs/numbers \
-RUN:     | FileCheck %s --check-prefix CHECK-HEX --strict-whitespace
+## Show that --radix combined with --print-file-name produces correct output.
 
-CHECK-NONE: numbers: three
-CHECK-NONE: numbers: four
-CHECK-NONE: numbers: five
-CHECK-NONE: numbers: seven
-CHECK-NONE: numbers: eight
-CHECK-NONE: numbers: nine
+RUN: echo one > %t
+RUN: echo two >> %t
+RUN: echo three >> %t
+RUN: echo four >> %t
+RUN: echo five >> %t
+RUN: echo six >> %t
+RUN: echo seven >> %t
+RUN: echo eight >> %t
+RUN: echo nine >> %t
+RUN: echo ten >> %t
 
-CHECK-DEC: numbers:       8 three
-CHECK-DEC: numbers:      14 four
-CHECK-DEC: numbers:      19 five
-CHECK-DEC: numbers:      28 seven
-CHECK-DEC: numbers:      34 eight
-CHECK-DEC: numbers:      40 nine
+RUN: llvm-strings --print-file-name %t \
+RUN:     | FileCheck %s --check-prefix CHECK-NONE -DFILE=%t --implicit-check-not={{.}}
+RUN: llvm-strings --print-file-name -t d %t \
+RUN:    | FileCheck %s --check-prefix CHECK-DEC --strict-whitespace -DFILE=%t --implicit-check-not={{.}}
+RUN: llvm-strings --print-file-name -t o %t \
+RUN:     | FileCheck %s --check-prefix CHECK-OCT --strict-whitespace -DFILE=%t --implicit-check-not={{.}}
+RUN: llvm-strings --print-file-name -t x %t \
+RUN:     | FileCheck %s --check-prefix CHECK-HEX --strict-whitespace -DFILE=%t --implicit-check-not={{.}}
 
-CHECK-OCT: numbers:      10 three
-CHECK-OCT: numbers:      16 four
-CHECK-OCT: numbers:      23 five
-CHECK-OCT: numbers:      34 seven
-CHECK-OCT: numbers:      42 eight
-CHECK-OCT: numbers:      50 nine
+CHECK-NONE: [[FILE]]: three
+CHECK-NONE: [[FILE]]: four
+CHECK-NONE: [[FILE]]: five
+CHECK-NONE: [[FILE]]: seven
+CHECK-NONE: [[FILE]]: eight
+CHECK-NONE: [[FILE]]: nine
 
-CHECK-HEX: numbers:       8 three
-CHECK-HEX: numbers:       e four
-CHECK-HEX: numbers:      13 five
-CHECK-HEX: numbers:      1c seven
-CHECK-HEX: numbers:      22 eight
-CHECK-HEX: numbers:      28 nine
+CHECK-DEC: [[FILE]]:       8 three
+CHECK-DEC: [[FILE]]:      14 four
+CHECK-DEC: [[FILE]]:      19 five
+CHECK-DEC: [[FILE]]:      28 seven
+CHECK-DEC: [[FILE]]:      34 eight
+CHECK-DEC: [[FILE]]:      40 nine
+
+CHECK-OCT: [[FILE]]:      10 three
+CHECK-OCT: [[FILE]]:      16 four
+CHECK-OCT: [[FILE]]:      23 five
+CHECK-OCT: [[FILE]]:      34 seven
+CHECK-OCT: [[FILE]]:      42 eight
+CHECK-OCT: [[FILE]]:      50 nine
+
+CHECK-HEX: [[FILE]]:       8 three
+CHECK-HEX: [[FILE]]:       e four
+CHECK-HEX: [[FILE]]:      13 five
+CHECK-HEX: [[FILE]]:      1c seven
+CHECK-HEX: [[FILE]]:      22 eight
+CHECK-HEX: [[FILE]]:      28 nine