llvm-dwarfdump: Make -brief the default and add a -verbose option instead.

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

llvm-svn: 312972

7 files changed, 11 insertions, 11 deletions

diff --git a/llvm/test/tools/llvm-dwp/X86/compress.test b/llvm/test/tools/llvm-dwp/X86/compress.test
index d9eadba57af..94275f4a176 100644
--- a/llvm/test/tools/llvm-dwp/X86/compress.test
+++ b/llvm/test/tools/llvm-dwp/X86/compress.test
@@ -1,5 +1,5 @@
 RUN: llvm-dwp %p/../Inputs/compress/a.dwo -o %t
-RUN: llvm-dwarfdump %t | FileCheck %s
+RUN: llvm-dwarfdump -v %t | FileCheck %s
 
 REQUIRES: zlib
 
diff --git a/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test b/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test
index 4bbc2fb7b62..3642d2ed333 100644
--- a/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test
+++ b/llvm/test/tools/llvm-dwp/X86/dwos_list_from_exec_simple.test
@@ -11,7 +11,7 @@ RUN: cp %p/../Inputs/dwos_list_from_exec/e.dwo e.dwo
 RUN: cp %p/../Inputs/dwos_list_from_exec/main main
 RUN: cp %p/../Inputs/dwos_list_from_exec/libd.so libd.so
 RUN: llvm-dwp c.dwo e.dwo -e main -e libd.so -o pkg.dwp
-RUN: llvm-dwarfdump pkg.dwp | FileCheck %s
+RUN: llvm-dwarfdump -v pkg.dwp | FileCheck %s
 
 Build commands for the test binaries:
 
diff --git a/llvm/test/tools/llvm-dwp/X86/empty.test b/llvm/test/tools/llvm-dwp/X86/empty.test
index 78e4eb9b889..7a9dd4258ff 100644
--- a/llvm/test/tools/llvm-dwp/X86/empty.test
+++ b/llvm/test/tools/llvm-dwp/X86/empty.test
@@ -1,5 +1,5 @@
 RUN: llvm-dwp %p/../Inputs/empty.dwo -o %t
-RUN: llvm-dwarfdump %t | FileCheck %s
+RUN: llvm-dwarfdump -v %t | FileCheck %s
 
 CHECK-LABEL: .debug_cu_index
 CHECK-NOT: version
diff --git a/llvm/test/tools/llvm-dwp/X86/gcc_type.test b/llvm/test/tools/llvm-dwp/X86/gcc_type.test
index b05fb01bdf7..3b7af9c6683 100644
--- a/llvm/test/tools/llvm-dwp/X86/gcc_type.test
+++ b/llvm/test/tools/llvm-dwp/X86/gcc_type.test
@@ -1,5 +1,5 @@
 RUN: llvm-dwp %p/../Inputs/gcc_type/a.dwo -o %t
-RUN: llvm-dwarfdump %t | FileCheck %s
+RUN: llvm-dwarfdump -v %t | FileCheck %s
 RUN: not llvm-dwp %p/../Inputs/gcc_type/a.dwo %p/../Inputs/gcc_type/a.dwo -o %t 2>&1 | FileCheck --check-prefix=DUP %s
 
 CHECK: Type Unit
diff --git a/llvm/test/tools/llvm-dwp/X86/merge.test b/llvm/test/tools/llvm-dwp/X86/merge.test
index 8feb5a0237e..c9ba6d17742 100644
--- a/llvm/test/tools/llvm-dwp/X86/merge.test
+++ b/llvm/test/tools/llvm-dwp/X86/merge.test
@@ -1,7 +1,7 @@
 RUN: llvm-dwp %p/../Inputs/merge/notypes/c.dwo %p/../Inputs/merge/notypes/ab.dwp -o %t
-RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s
+RUN: llvm-dwarfdump -v %t | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s
 
-FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.
+FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump -v doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.
 
 DWP from a DWO (c.dwo) and a DWP (ab.dwp, created from a.dwo and b.dwo)
 Make sure the entries for A and B are updated correctly when read/processed from ab.dwp
diff --git a/llvm/test/tools/llvm-dwp/X86/simple.test b/llvm/test/tools/llvm-dwp/X86/simple.test
index 4ac62b4bfb8..c3035dceccf 100644
--- a/llvm/test/tools/llvm-dwp/X86/simple.test
+++ b/llvm/test/tools/llvm-dwp/X86/simple.test
@@ -1,10 +1,10 @@
 RUN: llvm-dwp %p/../Inputs/simple/notypes/a.dwo %p/../Inputs/simple/notypes/b.dwo -o %t
-RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s
+RUN: llvm-dwarfdump -v %t | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s
 RUN: llvm-objdump -h %t | FileCheck --check-prefix=NOTYPOBJ %s
 UN: llvm-dwp %p/../Inputs/simple/types/a.dwo %p/../Inputs/simple/types/b.dwo -o %t
-UN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=TYPES %s
+UN: llvm-dwarfdump -v %t | FileCheck --check-prefix=CHECK --check-prefix=TYPES %s
 
-FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.
+FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump -v doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.
 
 DWP from non-type-unit debug info for these two translation units:
 a.cpp:
diff --git a/llvm/test/tools/llvm-dwp/X86/type_dedup.test b/llvm/test/tools/llvm-dwp/X86/type_dedup.test
index ac31b22c5ca..666db0f64f8 100644
--- a/llvm/test/tools/llvm-dwp/X86/type_dedup.test
+++ b/llvm/test/tools/llvm-dwp/X86/type_dedup.test
@@ -1,8 +1,8 @@
 RUN: llvm-dwp %p/../Inputs/type_dedup/a.dwo %p/../Inputs/type_dedup/b.dwo -o %t
-RUN: llvm-dwarfdump %t | FileCheck %s
+RUN: llvm-dwarfdump -v %t | FileCheck %s
 RUN: llvm-dwp %p/../Inputs/type_dedup/b.dwo -o %tb.dwp
 RUN: llvm-dwp %p/../Inputs/type_dedup/a.dwo %tb.dwp -o %t
-RUN: llvm-dwarfdump %t | FileCheck %s
+RUN: llvm-dwarfdump -v %t | FileCheck %s
 
 a.cpp:
   struct common { };