[llvm] 12b4df9 - [llvm-libtool-darwin] Speculative buildbot fix

[Shoaib Meenai via llvm-commits]

Author: Shoaib Meenai
Date: 2020-08-15T21:32:09-07:00
New Revision: 12b4df991950bea1d99b32e0babaf21eeb0ab4df

URL: https://github.com/llvm/llvm-project/commit/12b4df991950bea1d99b32e0babaf21eeb0ab4df
DIFF: https://github.com/llvm/llvm-project/commit/12b4df991950bea1d99b32e0babaf21eeb0ab4df.diff

LOG: [llvm-libtool-darwin] Speculative buildbot fix

http://lab.llvm.org:8011/builders/llvm-clang-win-x-armv7l is failing
this test. Attempt to explicitly use the Mach-O dump format as a
speculative fix.

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 515c3e419278..c421aa2451fc 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 --all-headers %t.lib | \
+# RUN: llvm-objdump --macho --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 --all-headers %t.lib | \
+# RUN: llvm-objdump --macho --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)