From: Fangrui Song <maskray@google.com>
Date: Wed, 1 May 2019 15:31:15 +0000 (+0000)
Subject: [llvm-ar][llvm-nm][llvm-size] Change -long-option to --long-option in tests. NFC
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34408e058a0a9a2aa28c42bede21a535644dbcdc;p=llvm

[llvm-ar][llvm-nm][llvm-size] Change -long-option to --long-option in tests. NFC

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@359688 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Object/archive-darwin-duplicates.test b/test/Object/archive-darwin-duplicates.test
index 294cfa38af8..8642a311f8c 100644
--- a/test/Object/archive-darwin-duplicates.test
+++ b/test/Object/archive-darwin-duplicates.test
@@ -10,7 +10,7 @@ RUN: printf sub1/test > %T/sub1/test.o
 RUN: printf baz > %T/baz.o
 
 RUN: rm -f %t.a
-RUN: llvm-ar -format=darwin rcs %t.a %T/sub1/test.o %T/test.o %T/baz.o
+RUN: llvm-ar --format=darwin rcs %t.a %T/sub1/test.o %T/test.o %T/baz.o
 RUN: FileCheck -strict-whitespace %s < %t.a
 
 CHECK:#1/12           1           0     0     644     28        `
diff --git a/test/Object/archive-extract.test b/test/Object/archive-extract.test
index 916ccc25432..44d76b4dd1f 100644
--- a/test/Object/archive-extract.test
+++ b/test/Object/archive-extract.test
@@ -37,13 +37,13 @@
 ; RUN: rm -f very_long_bytecode_file_name.bc
 ; RUN: llvm-ar xo %p/Inputs/GNU.a very_long_bytecode_file_name.bc
 ; RUN: rm -f %t.a
-; RUN: llvm-ar -format gnu rcU %t.a very_long_bytecode_file_name.bc
+; RUN: llvm-ar --format=gnu rcU %t.a very_long_bytecode_file_name.bc
 ; RUN: env TZ=GMT llvm-ar tv %t.a | FileCheck %s -check-prefix CHECK-GNU
 
 CHECK-GNU: 1465 Nov 19 03:01 2004 very_long_bytecode_file_name.bc
 
 ; RUN: rm -f %t.a
-; RUN: llvm-ar -format darwin rcU %t.a very_long_bytecode_file_name.bc
+; RUN: llvm-ar --format=darwin rcU %t.a very_long_bytecode_file_name.bc
 ; RUN: env TZ=GMT llvm-ar tv %t.a | FileCheck %s -check-prefix CHECK-DARWIN
 
 CHECK-DARWIN: 1472 Nov 19 03:01 2004 very_long_bytecode_file_name.bc
diff --git a/test/Object/archive-pad.test b/test/Object/archive-pad.test
index 343f51ef60a..a24c8d389c7 100644
--- a/test/Object/archive-pad.test
+++ b/test/Object/archive-pad.test
@@ -4,16 +4,16 @@ avoid a ld64 bug.
 RUN: echo foo > %t.o
 
 RUN: rm -f %t.a
-RUN: llvm-ar -format=bsd rc %t.a %t.o
+RUN: llvm-ar --format=bsd rc %t.a %t.o
 RUN: llvm-ar p %t.a > %t.bsd.o
 RUN: cmp %t.bsd.o %t.o
 
 RUN: rm -f %t.a
-RUN: llvm-ar -format=gnu rc %t.a %t.o
+RUN: llvm-ar --format=gnu rc %t.a %t.o
 RUN: llvm-ar p %t.a > %t.gnu.o
 RUN: cmp %t.gnu.o %t.o
 
 RUN: rm -f %t.a
-RUN: llvm-ar -format=darwin rc %t.a %t.o
+RUN: llvm-ar --format=darwin rc %t.a %t.o
 RUN: llvm-ar p %t.a > %t.darwin.o
 RUN: not cmp %t.darwin.o %t.o
diff --git a/test/Object/nm-darwin-m.test b/test/Object/nm-darwin-m.test
index a8d70070061..f0e5c0a0b13 100644
--- a/test/Object/nm-darwin-m.test
+++ b/test/Object/nm-darwin-m.test
@@ -1,6 +1,6 @@
-RUN: llvm-nm -format darwin %p/Inputs/darwin-m-test1.mach0-armv7 \
+RUN: llvm-nm --format=darwin %p/Inputs/darwin-m-test1.mach0-armv7 \
 RUN:         | FileCheck %s -check-prefix test1
-RUN: llvm-nm -format darwin %p/Inputs/darwin-m-test2.macho-i386 \
+RUN: llvm-nm --format=darwin %p/Inputs/darwin-m-test2.macho-i386 \
 RUN:         | FileCheck %s -check-prefix test2
 RUN: llvm-nm -m %p/Inputs/darwin-m-test3.macho-x86-64 \
 RUN:         | FileCheck %s -check-prefix test3
diff --git a/test/Object/nm-universal-binary.test b/test/Object/nm-universal-binary.test
index 1fce0eea645..f3da50d3de5 100644
--- a/test/Object/nm-universal-binary.test
+++ b/test/Object/nm-universal-binary.test
@@ -1,20 +1,20 @@
-RUN: llvm-nm -arch all %p/Inputs/macho-universal.x86_64.i386 \
+RUN: llvm-nm --arch=all %p/Inputs/macho-universal.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix CHECK-OBJ
-RUN: llvm-nm -arch all %p/Inputs/macho-universal64.x86_64.i386 \
+RUN: llvm-nm --arch=all %p/Inputs/macho-universal64.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix CHECK-64-OBJ
-RUN: llvm-nm -arch x86_64 %p/Inputs/macho-universal.x86_64.i386 \
+RUN: llvm-nm --arch=x86_64 %p/Inputs/macho-universal.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix CHECK-OBJ-x86_64
-RUN: not llvm-nm -arch armv7m %p/Inputs/macho-universal.x86_64.i386 2>&1 \
+RUN: not llvm-nm --arch=armv7m %p/Inputs/macho-universal.x86_64.i386 2>&1 \
 RUN:         | FileCheck %s -check-prefix CHECK-OBJ-armv7m
-RUN: not llvm-nm -arch foobar %p/Inputs/macho-universal.x86_64.i386 2>&1 \
+RUN: not llvm-nm --arch=foobar %p/Inputs/macho-universal.x86_64.i386 2>&1 \
 RUN:         | FileCheck %s -check-prefix CHECK-OBJ-foobar
-RUN: llvm-nm -arch all %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN: llvm-nm --arch=all %p/Inputs/macho-universal-archive.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix CHECK-AR
-RUN: llvm-nm -arch all %p/Inputs/macho-universal64-archive.x86_64.i386 \
+RUN: llvm-nm --arch=all %p/Inputs/macho-universal64-archive.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix CHECK-64-AR
-RUN: llvm-nm -arch i386 %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN: llvm-nm --arch=i386 %p/Inputs/macho-universal-archive.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix CHECK-AR-i386
-RUN: llvm-nm -o -arch all %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN: llvm-nm -o --arch=all %p/Inputs/macho-universal-archive.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix CHECK-AR-o
 
 CHECK-OBJ: macho-universal.x86_64.i386 (for architecture x86_64):
diff --git a/test/Object/size-trivial-macho.test b/test/Object/size-trivial-macho.test
index a6d3d1c4330..86bcccef151 100644
--- a/test/Object/size-trivial-macho.test
+++ b/test/Object/size-trivial-macho.test
@@ -2,21 +2,21 @@ RUN: llvm-size -A %p/Inputs/macho-text-data-bss.macho-x86_64 \
 RUN:         | FileCheck %s -check-prefix A
 RUN: llvm-size -B %p/Inputs/macho-text-data-bss.macho-x86_64 \
 RUN:         | FileCheck %s -check-prefix B
-RUN: llvm-size -format darwin %p/Inputs/macho-text-data-bss.macho-x86_64 \
+RUN: llvm-size --format=darwin %p/Inputs/macho-text-data-bss.macho-x86_64 \
 RUN:         | FileCheck %s -check-prefix m
 RUN: llvm-size %p/Inputs/macho-archive-x86_64.a \
 RUN:         | FileCheck %s -check-prefix AR
-RUN: llvm-size -format darwin %p/Inputs/macho-archive-x86_64.a \
+RUN: llvm-size --format=darwin %p/Inputs/macho-archive-x86_64.a \
 RUN:         | FileCheck %s -check-prefix mAR
 RUN: llvm-size -m -x -l %p/Inputs/hello-world.macho-x86_64 \
 RUN:         | FileCheck %s -check-prefix mxl
-RUN: llvm-size -arch all %p/Inputs/macho-universal.x86_64.i386 \
+RUN: llvm-size --arch all %p/Inputs/macho-universal.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix u
-RUN: llvm-size -arch i386 %p/Inputs/macho-universal.x86_64.i386 \
+RUN: llvm-size --arch i386 %p/Inputs/macho-universal.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix u-i386
-RUN: llvm-size -arch all %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN: llvm-size --arch all %p/Inputs/macho-universal-archive.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix uAR
-RUN: llvm-size -arch x86_64 %p/Inputs/macho-universal-archive.x86_64.i386 \
+RUN: llvm-size --arch x86_64 %p/Inputs/macho-universal-archive.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix uAR-x86_64
 
 A: section              size   addr
diff --git a/test/tools/gold/X86/thinlto_archive.ll b/test/tools/gold/X86/thinlto_archive.ll
index 789b963a6da..0c6a1519397 100644
--- a/test/tools/gold/X86/thinlto_archive.ll
+++ b/test/tools/gold/X86/thinlto_archive.ll
@@ -4,7 +4,7 @@
 ; RUN: opt -module-summary %p/Inputs/thinlto_archive2.ll -o %t3.o
 
 ; Generate the static library
-; RUN: llvm-ar -format=gnu r %t.a %t2.o %t3.o
+; RUN: llvm-ar --format=gnu r %t.a %t2.o %t3.o
 
 ; Test importing from archive library via gold, using jobs=1 to ensure
 ; output messages are not interleaved.
diff --git a/test/tools/llvm-ar/override.test b/test/tools/llvm-ar/override.test
index 0cbf5d85982..d8dff7807cb 100644
--- a/test/tools/llvm-ar/override.test
+++ b/test/tools/llvm-ar/override.test
@@ -1,7 +1,7 @@
 RUN: yaml2obj %S/Inputs/macho.yaml -o %t.o
 
 RUN: rm -f %t.ar
-RUN: llvm-ar -format gnu crs %t.ar %t.o
+RUN: llvm-ar --format=gnu crs %t.ar %t.o
 RUN: not grep -q __.SYMDEF %t.ar
 
 Ensure that we honour a specific request
diff --git a/test/tools/llvm-nm/ARM/macho-print-size.test b/test/tools/llvm-nm/ARM/macho-print-size.test
index 17fa2fd5802..8084ba6ed09 100644
--- a/test/tools/llvm-nm/ARM/macho-print-size.test
+++ b/test/tools/llvm-nm/ARM/macho-print-size.test
@@ -1,3 +1,3 @@
-@ RUN: llvm-nm --print-size --arch armv7m %p/Inputs/print-size.macho-armv7m 2>&1 | FileCheck %s
+@ RUN: llvm-nm --print-size --arch=armv7m %p/Inputs/print-size.macho-armv7m 2>&1 | FileCheck %s
 
 @ CHECK: warning: sizes with --print-size for Mach-O files are always zero.
diff --git a/test/tools/llvm-nm/X86/IRobj.test b/test/tools/llvm-nm/X86/IRobj.test
index 9cead8e335c..490fe5bc592 100644
--- a/test/tools/llvm-nm/X86/IRobj.test
+++ b/test/tools/llvm-nm/X86/IRobj.test
@@ -1,4 +1,4 @@
-# RUN: llvm-nm --format darwin %p/Inputs/test.IRobj-x86_64 | FileCheck %s
+# RUN: llvm-nm --format=darwin %p/Inputs/test.IRobj-x86_64 | FileCheck %s
 
 # CHECK: ---------------- (LTO,RODATA) external _global_const
 # CHECK: ---------------- (LTO,DATA) external _global_data
diff --git a/test/tools/llvm-nm/X86/posix-aliases.test b/test/tools/llvm-nm/X86/posix-aliases.test
index 2e0999339a2..71b05e507fb 100644
--- a/test/tools/llvm-nm/X86/posix-aliases.test
+++ b/test/tools/llvm-nm/X86/posix-aliases.test
@@ -1,5 +1,5 @@
 # RUN: llvm-nm -P %p/Inputs/hello.obj.elf-x86_64 > %t1
-# RUN: llvm-nm -format=posix %p/Inputs/hello.obj.elf-x86_64 > %t2
+# RUN: llvm-nm --format=posix %p/Inputs/hello.obj.elf-x86_64 > %t2
 # RUN: llvm-nm -portability %p/Inputs/hello.obj.elf-x86_64 > %t3
 # RUN: diff %t1 %t2
 # RUN: diff %t1 %t3
diff --git a/test/tools/llvm-strings/archive-filename.test b/test/tools/llvm-strings/archive-filename.test
index 5a65c349501..371525bbf51 100644
--- a/test/tools/llvm-strings/archive-filename.test
+++ b/test/tools/llvm-strings/archive-filename.test
@@ -1,5 +1,5 @@
 RUN: rm -rf %t && mkdir -p %t
-RUN: llvm-ar -format gnu crs %t/archive.a %S/Inputs/abcd
+RUN: llvm-ar --format=gnu crs %t/archive.a %S/Inputs/abcd
 RUN: llvm-strings -f %t/archive.a | FileCheck %s
 RUN: llvm-strings --print-file-name %t/archive.a | FileCheck %s
 
diff --git a/test/tools/llvm-strings/nested-archives.test b/test/tools/llvm-strings/nested-archives.test
index a0a395c8d9b..5bbfae44201 100644
--- a/test/tools/llvm-strings/nested-archives.test
+++ b/test/tools/llvm-strings/nested-archives.test
@@ -1,6 +1,6 @@
 RUN: rm -rf %t && mkdir -p %t
-RUN: llvm-ar -format gnu crs %t/inner.a %S/Inputs/abcd
-RUN: llvm-ar -format gnu crs %t/outer.a %t/inner.a
+RUN: llvm-ar --format=gnu crs %t/inner.a %S/Inputs/abcd
+RUN: llvm-ar --format=gnu crs %t/outer.a %t/inner.a
 RUN: llvm-strings %t/outer.a | FileCheck %s
 
 CHECK: !<arch>