[Darwin] Specify DWARF 2/4 when running apple accelerator tests.

These sections will be retired. Also, explicitly list llvm-objdump
as a dependency. This should've been done in the previous commit,
but I failed to squash the two changes together.

Thanks to Adrian for pointing the first problem out in a comment.

2 files changed, 6 insertions, 1 deletions

diff --git a/debuginfo-tests/CMakeLists.txt b/debuginfo-tests/CMakeLists.txt
index 87260f10cc9..fbab61c527d 100644
--- a/debuginfo-tests/CMakeLists.txt
+++ b/debuginfo-tests/CMakeLists.txt
@@ -9,6 +9,7 @@ set(DEBUGINFO_TEST_DEPS
   clang
   FileCheck
   count
+  llvm-objdump
   not
   )
 
diff --git a/debuginfo-tests/apple-accel.cpp b/debuginfo-tests/apple-accel.cpp
index e64422119ec..9c5e08e40d1 100644
--- a/debuginfo-tests/apple-accel.cpp
+++ b/debuginfo-tests/apple-accel.cpp
@@ -1,7 +1,11 @@
 // REQUIRES: system-darwin
 // Test that clang produces the __apple accelerator tables,
 // e.g., __apple_types, correctly.
-// RUN: %clang %s %target_itanium_abi_host_triple -O0 -c -g -o %t-ex
+// These sections are going to be retired in DWARF 5, so we hardcode
+// the DWARF version in the tests.
+// RUN: %clang %s %target_itanium_abi_host_triple -gdwarf-2 -O0 -c -g -o %t-ex
+// RUN: llvm-objdump -section-headers %t-ex | FileCheck %s
+// RUN: %clang %s %target_itanium_abi_host_triple -gdwarf-4 -O0 -c -g -o %t-ex
 // RUN: llvm-objdump -section-headers %t-ex | FileCheck %s
 
 int main (int argc, char const *argv[]) { return argc; }