Author: Hans Wennborg Date: 2020-02-03T11:36:46+01:00 New Revision: e11d70cfe7e2a8537eb774ed1780e9ecd1aa90a0
URL: https://github.com/llvm/llvm-project/commit/e11d70cfe7e2a8537eb774ed1780e9ecd1aa90a0 DIFF: https://github.com/llvm/llvm-project/commit/e11d70cfe7e2a8537eb774ed1780e9ecd1aa90a0.diff LOG: Make quick-append.test resilient to running in paths with '1.o' in the name (cherry picked from commit f00ab188f4e4214dfbecfdd8968a183e9363cefa) Added: Modified: llvm/test/tools/llvm-ar/quick-append.test Removed: ################################################################################ diff --git a/llvm/test/tools/llvm-ar/quick-append.test b/llvm/test/tools/llvm-ar/quick-append.test index 0df538eed0dd..968460ec88fa 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 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
