1 files changed, 18 insertions, 25 deletions
diff --git a/test/DebugInfo/PDB/pdbdump-mergeids.test b/test/DebugInfo/PDB/pdbdump-mergeids.test
index 1c0a8704af2a..441ce4d8dbc8 100644
--- a/test/DebugInfo/PDB/pdbdump-mergeids.test
+++ b/test/DebugInfo/PDB/pdbdump-mergeids.test
@@ -1,31 +1,24 @@
 ; RUN: llvm-pdbutil yaml2pdb -pdb=%t.1.pdb %p/Inputs/merge-ids-1.yaml
 ; RUN: llvm-pdbutil yaml2pdb -pdb=%t.2.pdb %p/Inputs/merge-ids-2.yaml
 ; RUN: llvm-pdbutil merge -pdb=%t.3.pdb %t.1.pdb %t.2.pdb
-; RUN: llvm-pdbutil raw -ipi-records %t.3.pdb | FileCheck -check-prefix=MERGED %s
-; RUN: llvm-pdbutil raw -ipi-records %t.3.pdb | FileCheck -check-prefix=SUBSTRS %s
-; RUN: llvm-pdbutil raw -tpi-records %t.3.pdb | FileCheck -check-prefix=TPI-EMPTY %s
+; RUN: llvm-pdbutil raw -ids %t.3.pdb | FileCheck -check-prefix=MERGED %s
+; RUN: llvm-pdbutil raw -types %t.3.pdb | FileCheck -check-prefix=TPI-EMPTY %s
 
 
-MERGED: Type Info Stream (IPI)
-MERGED: Record count: 8
-MERGED-DAG: StringData: One
-MERGED-DAG: StringData: Two
-MERGED-DAG: StringData: SubOne
-MERGED-DAG: StringData: SubTwo
-MERGED-DAG: StringData: Main
-MERGED-DAG: TypeLeafKind: LF_SUBSTR_LIST
-MERGED-DAG: StringData: OnlyInFirst
-MERGED-DAG: StringData: OnlyInSecond
+MERGED:                          Types (IPI Stream)
+MERGED-NEXT: ============================================================
+MERGED-NEXT:   Showing 8 records
+MERGED-NEXT:   0x1000 | LF_STRING_ID [size = 12] ID: <no type>, String: One
+MERGED-NEXT:   0x1001 | LF_STRING_ID [size = 12] ID: <no type>, String: Two
+MERGED-NEXT:   0x1002 | LF_STRING_ID [size = 20] ID: <no type>, String: OnlyInFirst
+MERGED-NEXT:   0x1003 | LF_STRING_ID [size = 16] ID: <no type>, String: SubOne
+MERGED-NEXT:   0x1004 | LF_STRING_ID [size = 16] ID: <no type>, String: SubTwo
+MERGED-NEXT:   0x1005 | LF_SUBSTR_LIST [size = 16]
+MERGED-NEXT:            0x1003: `SubOne`
+MERGED-NEXT:            0x1004: `SubTwo`
+MERGED-NEXT:   0x1006 | LF_STRING_ID [size = 16] ID: 0x1005, String: Main
+MERGED-NEXT:   0x1007 | LF_STRING_ID [size = 24] ID: <no type>, String: OnlyInSecond
 
-SUBSTRS:      StringList
-SUBSTRS:        TypeLeafKind: LF_SUBSTR_LIST
-SUBSTRS-NEXT:   NumStrings: 2
-SUBSTRS-NEXT:   Strings [
-SUBSTRS-NEXT:     SubOne
-SUBSTRS-NEXT:     SubTwo
-SUBSTRS:      StringId
-SUBSTRS-NEXT:   TypeLeafKind: LF_STRING_ID
-SUBSTRS-NEXT:   Id: "SubOne" "SubTwo"
-SUBSTRS-NEXT:   StringData: Main
-
-TPI-EMPTY: Record count: 0
+TPI-EMPTY:                     Types (TPI Stream)
+TPI-EMPTY-NEXT: ============================================================
+TPI-EMPTY-NEXT:   Showing 0 records