summaryrefslogtreecommitdiffstats
path: root/llvm/test/tools/llvm-ar
diff options
context:
space:
mode:
authorHans Wennborg <hans@chromium.org>2020-02-03 11:34:36 +0100
committerHans Wennborg <hans@chromium.org>2020-02-03 11:36:46 +0100
commite11d70cfe7e2a8537eb774ed1780e9ecd1aa90a0 (patch)
treec2ce5e10c69fccf1252c1e0298383ed3e7afe94e /llvm/test/tools/llvm-ar
parentf85d63a558364dcf57efe7b37b3e99b7fd91fd5c (diff)
downloadbcm5719-llvm-e11d70cfe7e2a8537eb774ed1780e9ecd1aa90a0.tar.gz
bcm5719-llvm-e11d70cfe7e2a8537eb774ed1780e9ecd1aa90a0.zip
Make quick-append.test resilient to running in paths with '1.o' in the name
(cherry picked from commit f00ab188f4e4214dfbecfdd8968a183e9363cefa)
Diffstat (limited to 'llvm/test/tools/llvm-ar')
-rw-r--r--llvm/test/tools/llvm-ar/quick-append.test18
1 files changed, 9 insertions, 9 deletions
diff --git a/llvm/test/tools/llvm-ar/quick-append.test b/llvm/test/tools/llvm-ar/quick-append.test
index 0df538eed0d..968460ec88f 100644
--- a/llvm/test/tools/llvm-ar/quick-append.test
+++ b/llvm/test/tools/llvm-ar/quick-append.test
@@ -9,7 +9,7 @@
# RUN: llvm-ar t %t/single.a \
# RUN: | FileCheck %s --check-prefix=SINGLE --match-full-lines --implicit-check-not {{.}}
-# SINGLE: 1.o
+# SINGLE: 1.o{{$}}
# RUN: llvm-nm --print-armap %t/single.a \
# RUN: | FileCheck %s --check-prefix=SINGLE-SYM
@@ -21,28 +21,28 @@
# RUN: llvm-ar t %t/multiple.a \
# RUN: | FileCheck %s --check-prefix=MULTIPLE --match-full-lines --implicit-check-not {{.}}
-# MULTIPLE: 1.o
-# MULTIPLE-NEXT: 2.o
+# MULTIPLE: 1.o{{$}}
+# MULTIPLE-NEXT: 2.o{{$}}
# RUN: llvm-nm --print-armap %t/multiple.a \
# RUN: | FileCheck %s --check-prefix=MULTIPLE-SYM
-# MULTIPLE-SYM: symbol1
-# MULTIPLE-SYM-NEXT: symbol2
+# MULTIPLE-SYM: symbol1 in 1.o
+# MULTIPLE-SYM-NEXT: symbol2 in 2.o
## Append same member:
# RUN: llvm-ar qc %t/same.a %t/1.o %t/1.o
# RUN: llvm-ar t %t/same.a \
# RUN: | FileCheck %s --check-prefix=SAME -DFILE=%t/2.o --match-full-lines --implicit-check-not {{.}}
-# SAME: 1.o
-# SAME-NEXT: 1.o
+# SAME: 1.o{{$}}
+# SAME-NEXT: 1.o{{$}}
# RUN: llvm-nm --print-armap %t/same.a \
# RUN: | FileCheck %s --check-prefix=SAME-SYM
-# SAME-SYM: symbol1
-# SAME-SYM-NEXT: symbol1
+# SAME-SYM: symbol1 in 1.o
+# SAME-SYM-NEXT: symbol1 in 1.o
## Append without member:
# RUN: llvm-ar qc %t/without.a
OpenPOWER on IntegriCloud