[llvm] 402b063 - [llvm-libtool-darwin] Fix test on all host architectures

[Shoaib Meenai via llvm-commits]

Author: Shoaib Meenai
Date: 2020-08-16T00:18:03-07:00
New Revision: 402b063c80674aef9c4eb5997f1054dac0fca073

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

LOG: [llvm-libtool-darwin] Fix test on all host architectures

By default, if a universal binary has a slice matching the host
architecture, llvm-objdump will only print that slice, otherwise it'll
print all architectures. Explicitly pass `--arch all` to force it to
always print all architectures, as we want for this test.

Added: 
    

Modified: 
    llvm/test/tools/llvm-libtool-darwin/universal-output.test

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-libtool-darwin/universal-output.test b/llvm/test/tools/llvm-libtool-darwin/universal-output.test
index c421aa2451fc..57d420bd3ebc 100644
--- a/llvm/test/tools/llvm-libtool-darwin/universal-output.test
+++ b/llvm/test/tools/llvm-libtool-darwin/universal-output.test
@@ -17,7 +17,7 @@
 # RUN: llvm-libtool-darwin -static -o %t.lib %t.armv6 %t.armv6 %t.armv7
 # RUN: llvm-lipo -info %t.lib | \
 # RUN:   FileCheck %s --check-prefix=ARCHS -DFILE=%t.lib
-# RUN: llvm-objdump --macho --all-headers %t.lib | \
+# RUN: llvm-objdump --macho --arch all --all-headers %t.lib | \
 # RUN:   FileCheck %s --check-prefix=UNIVERSAL-MEMBERS -DFILE=%t.lib -DPREFIX=%basename_t.tmp --implicit-check-not=Archive
 
 # UNIVERSAL-MEMBERS:      Archive : [[FILE]] (architecture armv6)
@@ -57,7 +57,7 @@
 # RUN: yaml2obj %s -o %t.arm64 -DTYPE=0x0100000C -DSUBTYPE=0x0 -DSTRING=_arm64all
 # RUN: yaml2obj %s -o %t.arm64e -DTYPE=0x0100000C -DSUBTYPE=0x2 -DSTRING=_arm64e
 # RUN: llvm-libtool-darwin -static -o %t.lib %t.arm64 %t.arm64e
-# RUN: llvm-objdump --macho --all-headers %t.lib | \
+# RUN: llvm-objdump --macho --arch all --all-headers %t.lib | \
 # RUN:   FileCheck %s --check-prefix=UNIVERSAL-MEMBERS-ARM64 -DFILE=%t.lib -DPREFIX=%basename_t.tmp --implicit-check-not=Archive
 
 # UNIVERSAL-MEMBERS-ARM64:      Archive : [[FILE]] (architecture arm64)