[llvm-nm][test] Avoid deprecated alias -M (--print-armap)

-M was inappropriately added since -s is taken by Darwin nm.
-M is deprecated. Tests should use --print-armap instead.

diff --git a/llvm/test/Object/X86/archive-ir-asm.ll b/llvm/test/Object/X86/archive-ir-asm.ll
index 560ac17..a81634f 100644 (file)
--- a/llvm/test/Object/X86/archive-ir-asm.ll
+++ b/llvm/test/Object/X86/archive-ir-asm.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o=%t1
 ; RUN: rm -f %t2
 ; RUN: llvm-ar rcs %t2 %t1
-; RUN: llvm-nm -M %t2 | FileCheck %s
+; RUN: llvm-nm --print-armap %t2 | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

diff --git a/llvm/test/Object/X86/archive-symbol-table.s b/llvm/test/Object/X86/archive-symbol-table.s
index 2e6fcbe..f61592a 100644 (file)
--- a/llvm/test/Object/X86/archive-symbol-table.s
+++ b/llvm/test/Object/X86/archive-symbol-table.s
@@ -1,7 +1,7 @@
 # RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 # RUN: rm -f %t
 # RUN: llvm-ar rcs %t %t.o
-# RUN: llvm-nm -M %t | FileCheck %s
+# RUN: llvm-nm --print-armap %t | FileCheck %s
 
 # Test that weak undefined symbols don't show up in the archive symbol
 # table.

diff --git a/llvm/test/Object/archive-long-index.test b/llvm/test/Object/archive-long-index.test
index 6feb69e..8e234c9 100644 (file)
--- a/llvm/test/Object/archive-long-index.test
+++ b/llvm/test/Object/archive-long-index.test
@@ -1,7 +1,7 @@
 #
 # Check if the index is appearing properly in the output file
 #
-RUN: llvm-nm -M %p/Inputs/liblong_filenames.a | FileCheck -check-prefix=CHECKIDX %s
+RUN: llvm-nm --print-armap %p/Inputs/liblong_filenames.a | FileCheck -check-prefix=CHECKIDX %s
 
 CHECKIDX: Archive map
 CHECKIDX: abcdefghijklmnopqrstuvwxyz12345678 in 1.o

diff --git a/llvm/test/Object/archive-symtab.test b/llvm/test/Object/archive-symtab.test
index 31cd849..e586721 100644 (file)
--- a/llvm/test/Object/archive-symtab.test
+++ b/llvm/test/Object/archive-symtab.test
@@ -48,16 +48,16 @@ Symbols:
 
 # RUN: rm -f %t.a
 # RUN: llvm-ar rcsU %t.a %t.elf-x86-64 %t2.elf-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s
 
 # RUN: rm -f %t.a
 # RUN: env SYM64_THRESHOLD=836 llvm-ar rcsU %t.a %t.elf-x86-64 %t2.elf-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s
 # RUN: grep '/SYM64/' %t.a
 
 # RUN: rm -f %t.a
 # RUN: env SYM64_THRESHOLD=837 llvm-ar rcsU %t.a %t.elf-x86-64 %t2.elf-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s
 # RUN: not grep '/SYM64/' %t.a
 
 # CHECK: Archive map
@@ -69,7 +69,7 @@ Symbols:
 
 # RUN: rm -f %t.a
 # RUN: llvm-ar --format=gnu rcT %t.a %t.elf-x86-64 %t2.elf-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck -DFILE=%/t.elf-x86-64 -DFILE2=%/t2.elf-x86-64 --check-prefix=THIN %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck -DFILE=%/t.elf-x86-64 -DFILE2=%/t2.elf-x86-64 --check-prefix=THIN %s
 
 # THIN: Archive map
 # THIN-NEXT: main in [[FILE]]
@@ -89,17 +89,17 @@ Symbols:
 
 # RUN: rm -f %t.a
 # RUN: llvm-ar rcSU %t.a %t.elf-x86-64 %t2.elf-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=NOMAP
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s --check-prefix=NOMAP
 
 # NOMAP-NOT: Archive map
 
 # RUN: llvm-ar s %t.a
-# RUN: llvm-nm -M %t.a | FileCheck %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s
 
 ## Check that the archive does have a corrupt symbol table.
 # RUN: rm -f %t.a
 # RUN: cp %p/Inputs/archive-test.a-corrupt-symbol-table %t.a
-# RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=CORRUPT
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s --check-prefix=CORRUPT
 
 # CORRUPT: Archive map
 # CORRUPT-NEXT: mbin in trivial-object-test.elf-x86-64
@@ -118,19 +118,19 @@ Symbols:
 
 ## Check that the we *don't* update the symbol table.
 # RUN: llvm-ar s %t.a
-# RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=CORRUPT
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s --check-prefix=CORRUPT
 
 ## Repeat the test with llvm-ranlib.
 
 # RUN: rm -f %t.a
 # RUN: llvm-ar rcSU %t.a %t.elf-x86-64 %t2.elf-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=NOMAP
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s --check-prefix=NOMAP
 
 # RUN: llvm-ranlib %t.a
-# RUN: llvm-nm -M %t.a | FileCheck %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck %s
 
-# RUN: llvm-nm -M %p/Inputs/macho-archive-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
-# RUN: llvm-nm -M %p/Inputs/macho-archive-unsorted-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
+# RUN: llvm-nm --print-armap %p/Inputs/macho-archive-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
+# RUN: llvm-nm --print-armap %p/Inputs/macho-archive-unsorted-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
 
 # BSD-MachO: Archive map
 # BSD-MachO: _bar in bar.o
@@ -138,16 +138,16 @@ Symbols:
 
 # RUN: rm -f %t.a
 # RUN: llvm-ar --format=bsd rcsU %t.a %p/Inputs/trivial-object-test.macho-x86-64 %p/Inputs/trivial-object-test2.macho-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck --check-prefix=MACHO %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck --check-prefix=MACHO %s
 
 # RUN: rm -f %t.a
 # RUN: env SYM64_THRESHOLD=784 llvm-ar --format=darwin rcsU %t.a %p/Inputs/trivial-object-test.macho-x86-64 %p/Inputs/trivial-object-test2.macho-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck --check-prefix=MACHO %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck --check-prefix=MACHO %s
 # RUN: grep '__\.SYMDEF_64' %t.a
 
 # RUN: rm -f %t.a
 # RUN: env SYM64_THRESHOLD=785 llvm-ar --format=darwin rcsU %t.a %p/Inputs/trivial-object-test.macho-x86-64 %p/Inputs/trivial-object-test2.macho-x86-64
-# RUN: llvm-nm -M %t.a | FileCheck --check-prefix=MACHO %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck --check-prefix=MACHO %s
 # RUN: not grep '__\.SYMDEF_64' %t.a
 
 # MACHO: Archive map
@@ -167,7 +167,7 @@ Symbols:
 # MACHO-NEXT: 0000000000000001 T _foo
 # MACHO-NEXT: 0000000000000002 T _main
 
-# RUN: llvm-nm -M %p/Inputs/macho-toc64-archive-x86_64.a | FileCheck --check-prefix=MACHO-TOC64 %s
+# RUN: llvm-nm --print-armap %p/Inputs/macho-toc64-archive-x86_64.a | FileCheck --check-prefix=MACHO-TOC64 %s
 
 # MACHO-TOC64: Archive map
 # MACHO-TOC64-NEXT: _test in test.o
@@ -175,7 +175,7 @@ Symbols:
 
 # RUN: rm -f %t.a
 # RUN: llvm-ar --format=gnu rcsU %t.a %p/Inputs/coff-short-import-code %p/Inputs/coff-short-import-data
-# RUN: llvm-nm -M %t.a | FileCheck --check-prefix=COFF-SHORT-IMPORT %s
+# RUN: llvm-nm --print-armap %t.a | FileCheck --check-prefix=COFF-SHORT-IMPORT %s
 
 # COFF-SHORT-IMPORT:      Archive map
 # COFF-SHORT-IMPORT-NEXT: __imp__foo in coff-short-import-code

diff --git a/llvm/test/Object/nm-archive.test b/llvm/test/Object/nm-archive.test
index 0244949..a231267 100644 (file)
--- a/llvm/test/Object/nm-archive.test
+++ b/llvm/test/Object/nm-archive.test
@@ -48,7 +48,7 @@ RUN: llvm-nm %p/Inputs/archive-test.a-gnu-minimal
 
 
 And don't crash when asked to print a non-existing symtab.
-RUN: llvm-nm -M %p/Inputs/archive-test.a-gnu-minimal
+RUN: llvm-nm --print-armap %p/Inputs/archive-test.a-gnu-minimal
 
 Don't reject an empty archive.
 RUN: llvm-nm %p/Inputs/archive-test.a-empty

diff --git a/llvm/test/Object/simple-archive.test b/llvm/test/Object/simple-archive.test
index 085a91e..b467d0d 100644 (file)
--- a/llvm/test/Object/simple-archive.test
+++ b/llvm/test/Object/simple-archive.test
@@ -1,7 +1,7 @@
 #
 # Check if the index is appearing properly in the output file
 #
-RUN: llvm-nm -M %p/Inputs/libsimple_archive.a | FileCheck -check-prefix=CHECKIDX %s
+RUN: llvm-nm --print-armap %p/Inputs/libsimple_archive.a | FileCheck -check-prefix=CHECKIDX %s
 
 CHECKIDX: Archive map
 CHECKIDX: abcdefghijklmnopqrstuvwxyz12345678 in 1.o