[lld] eff6e75 - [LLD][ELF] Correct test temporary file paths

Jeremy Morse via llvm-commits llvm-commits at lists.llvm.org
Wed Jan 20 03:46:23 PST 2021


Author: Jeremy Morse
Date: 2021-01-20T11:46:11Z
New Revision: eff6e75c3f7c5471f0326526dc3f0b8b10f8a4df

URL: https://github.com/llvm/llvm-project/commit/eff6e75c3f7c5471f0326526dc3f0b8b10f8a4df
DIFF: https://github.com/llvm/llvm-project/commit/eff6e75c3f7c5471f0326526dc3f0b8b10f8a4df.diff

LOG: [LLD][ELF] Correct test temporary file paths

In 8031785f4a7ebd the temporary object being built was moved to %t/main.o,
but not all run lines were updated to reflect this. Observe the failure
on this buildbot:

  http://lab.llvm.org:8011/#/builders/5/builds/3646/steps/9/logs/stdio

It might pass locally for some people due to a stale %t.o hanging around
the build directory.

Added: 
    

Modified: 
    lld/test/ELF/wrap-shlib-undefined.s

Removed: 
    


################################################################################
diff  --git a/lld/test/ELF/wrap-shlib-undefined.s b/lld/test/ELF/wrap-shlib-undefined.s
index f46ebe36b779..0c4a79171e27 100644
--- a/lld/test/ELF/wrap-shlib-undefined.s
+++ b/lld/test/ELF/wrap-shlib-undefined.s
@@ -31,7 +31,7 @@
 # CHECK2-NEXT: NOTYPE  GLOBAL DEFAULT    6 foo
 
 ## __wrap_bar is undefined.
-# RUN: ld.lld -shared %t.o --wrap=bar -o %t3.so
+# RUN: ld.lld -shared %t/main.o --wrap=bar -o %t3.so
 # RUN: llvm-readelf -r --dyn-syms %t3.so | FileCheck %s --check-prefix=CHECK3
 # CHECK3:      R_X86_64_JUMP_SLOT 0000000000000000 __wrap_bar + 0
 # CHECK3:      Symbol table '.dynsym' contains 4 entries:
@@ -41,7 +41,7 @@
 # CHECK3-NEXT: NOTYPE  GLOBAL DEFAULT    6 foo
 
 ## __wrap_bar is defined in %t/wrap.so.
-# RUN: ld.lld -shared %t.o %t/wrap.so --wrap=bar -o %t4.so
+# RUN: ld.lld -shared %t/main.o %t/wrap.so --wrap=bar -o %t4.so
 # RUN: llvm-readelf -r --dyn-syms %t4.so | FileCheck %s --check-prefix=CHECK4
 # CHECK4:      R_X86_64_JUMP_SLOT {{.*}} __wrap_bar + 0
 # CHECK4:      Symbol table '.dynsym' contains 4 entries:
@@ -50,7 +50,7 @@
 # CHECK4-NEXT: NOTYPE  GLOBAL DEFAULT    6 _start
 # CHECK4-NEXT: NOTYPE  GLOBAL DEFAULT    6 foo
 
-# RUN: ld.lld %t.o %t/wrap.so --wrap bar -o %t1
+# RUN: ld.lld %t/main.o %t/wrap.so --wrap bar -o %t1
 # RUN: llvm-readelf --dyn-syms %t1 | FileCheck %s --check-prefix=DYNSYM
 # RUN: llvm-objdump -d %t1 | FileCheck %s --check-prefix=ASM
 


        


More information about the llvm-commits mailing list