From c1779194097f0553c292750195673ae65fdc4d32 Mon Sep 17 00:00:00 2001 From: Matthew Voss Date: Fri, 6 Sep 2019 22:51:46 +0000 Subject: [PATCH] Update lld tests dynamic-list.s and symbol-override.s to use llvm-nm 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 --- lld/test/ELF/dynamic-list.s | 6 +++--- lld/test/ELF/symbol-override.s | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lld/test/ELF/dynamic-list.s b/lld/test/ELF/dynamic-list.s index dfc468596fb5e6..d2bec496b7ea39 100644 --- a/lld/test/ELF/dynamic-list.s +++ b/lld/test/ELF/dynamic-list.s @@ -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). @@ -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 @@ -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 diff --git a/lld/test/ELF/symbol-override.s b/lld/test/ELF/symbol-override.s index 6da11338ba0092..d3b691def4e7a5 100644 --- a/lld/test/ELF/symbol-override.s +++ b/lld/test/ELF/symbol-override.s @@ -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