Write new tests for r362121

Summary:
The tests for r362121 ran dsymutil against a test binary every time.
This caused problems on lld-x86_64-ubuntu-fast as dsymutil required
a lipo tool be available to process those binaries.

This change rewrites the new test cases in macho-disassemble-g-dsym
to use bespoke test binaries (exe and dwarf) simplifying the test's
runtime dependencies.

The changes to tools/llvm-objdump/MachODump.cpp are unchanged from
r362121

Reviewers: pete, lhames, JDevlieghere

Reviewed By: pete

Subscribers: smeenai, aprantl, rupprecht, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D62694

llvm-svn: 362141

5 files changed, 14 insertions, 0 deletions

diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat
new file mode 100755
index 00000000000..bcfbeeb97de
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat
diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat.dwarf b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat.dwarf
new file mode 100644
index 00000000000..57855afaa11
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-fat.dwarf
diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin
new file mode 100755
index 00000000000..c7283b408cd
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin
diff --git a/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin.dwarf b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin.dwarf
new file mode 100644
index 00000000000..9bcd6e2130c
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/X86/Inputs/hello-macho-thin.dwarf
diff --git a/llvm/test/tools/llvm-objdump/X86/macho-disassemble-g-dsym.test b/llvm/test/tools/llvm-objdump/X86/macho-disassemble-g-dsym.test
index f06567764b8..c4841bbcb52 100644
--- a/llvm/test/tools/llvm-objdump/X86/macho-disassemble-g-dsym.test
+++ b/llvm/test/tools/llvm-objdump/X86/macho-disassemble-g-dsym.test
@@ -5,3 +5,17 @@
 // RUN: FileCheck --input-file %t0 %s
 
 CHECK: Disassembly of section __TEXT,__text:
+
+// RUN: llvm-objdump -m -d -g -dsym %p/Inputs/hello-macho-fat.dwarf %p/Inputs/hello-macho-fat | FileCheck -check-prefix MACHO_DSYM %s
+// RUN: llvm-objdump -m -d -g -dsym %p/Inputs/hello-macho-fat.dwarf %p/Inputs/hello-macho-thin | FileCheck -check-prefix MACHO_DSYM %s
+// RUN: llvm-objdump -m -d -g -dsym %p/Inputs/hello-macho-thin.dwarf %p/Inputs/hello-macho-thin | FileCheck -check-prefix MACHO_DSYM %s
+
+MACHO_DSYM: (__TEXT,__text) section
+
+// RUN: llvm-objdump -m -d -g -dsym %p/../Inputs/libbogus11.a %p/../../dsymutil/Inputs/basic.macho.x86_64 2>&1 | FileCheck -check-prefix BAD_INPUT %s
+
+BAD_INPUT: is not a Mach-O or Universal file type.
+
+// RUN: not llvm-objdump -m -d -g -dsym %p/Inputs %p/Inputs/hello-macho-thin 2>&1 | FileCheck -check-prefix DIRECTORY %s
+
+DIRECTORY: Is a directory