Skip to content

Commit

Permalink
Update lld tests dynamic-list.s and symbol-override.s to use llvm-nm
Browse files Browse the repository at this point in the history
The following tests failed on Windows bots due to nm not being
available:

  lld/test/ELF/dynamic-list.s
  lld/test/ELF/symbol-override.s

llvm-svn: 371267
  • Loading branch information
ormris committed Sep 6, 2019
1 parent a1cf4d9 commit c177919
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions lld/test/ELF/dynamic-list.s
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
## Check exporting only one symbol.
# RUN: echo '{ foo1; };' > %t.list
# RUN: ld.lld --dynamic-list %t.list %t.o %t2.so -o %t
# RUN: nm -D %t | FileCheck %s --implicit-check-not=foo
# RUN: llvm-nm -D %t | FileCheck %s --implicit-check-not=foo

## And now using quoted strings (the output is the same since it does not
## use any wildcard character).
Expand All @@ -26,7 +26,7 @@
## Now export all the foo1, foo2, and foo31 symbols
# RUN: echo "{ foo1; foo2; foo31; };" > %t.list
# RUN: ld.lld --dynamic-list %t.list %t.o %t2.so -o %t
# RUN: nm -D %t | FileCheck --check-prefix=CHECK2 %s --implicit-check-not=foo
# RUN: llvm-nm -D %t | FileCheck --check-prefix=CHECK2 %s --implicit-check-not=foo
# RUN: echo "{ foo1; foo2; };" > %t1.list
# RUN: echo "{ foo31; };" > %t2.list
# RUN: ld.lld --dynamic-list %t1.list --dynamic-list %t2.list %t.o %t2.so -o %t2
Expand All @@ -39,7 +39,7 @@
## --export-dynamic is similar to --dynamic-list with '{ * }'
# RUN: echo "{ foo2; };" > %t.list
# RUN: ld.lld --dynamic-list %t.list --export-dynamic %t.o %t2.so -o %t
# RUN: nm -D %t | FileCheck --check-prefix=CHECK3 %s --implicit-check-not=foo
# RUN: llvm-nm -D %t | FileCheck --check-prefix=CHECK3 %s --implicit-check-not=foo

## The same with --export-dynamic-symbol.
# RUN: ld.lld --export-dynamic-symbol=foo2 --export-dynamic %t.o %t2.so -o %t2
Expand Down
2 changes: 1 addition & 1 deletion lld/test/ELF/symbol-override.s
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/symbol-override.s -o %t2.o
// RUN: ld.lld -shared %t2.o -o %t2.so
// RUN: ld.lld %t1.o %t2.so -o %t
// RUN: nm -D %t | FileCheck %s
// RUN: llvm-nm -D %t | FileCheck %s

// CHECK: do
// CHECK-NEXT: foo
Expand Down

0 comments on commit c177919

Please sign in to comment.