1 files changed, 44 insertions, 29 deletions
diff --git a/llvm/test/DebugInfo/PDB/pdbdump-readwrite.test b/llvm/test/DebugInfo/PDB/pdbdump-readwrite.test
index 51ebd754545..ee53f3b4cd2 100644
--- a/llvm/test/DebugInfo/PDB/pdbdump-readwrite.test
+++ b/llvm/test/DebugInfo/PDB/pdbdump-readwrite.test
@@ -3,33 +3,48 @@ RUN:   -pdb-stream -string-table -tpi-stream -stream-directory \
 RUN:   -stream-metadata %p/Inputs/empty.pdb > %t.1
 RUN: llvm-pdbutil yaml2pdb -pdb=%t.2 %t.1
 
-RUN: llvm-pdbutil raw -summary -string-table -types %p/Inputs/empty.pdb | FileCheck %s
-RUN: llvm-pdbutil raw -summary -string-table -types %t.2 | FileCheck %s
+RUN: llvm-pdbutil raw -headers -string-table -tpi-records %p/Inputs/empty.pdb | FileCheck %s
+RUN: llvm-pdbutil raw -headers -string-table -tpi-records %t.2 | FileCheck %s
 
-
-CHECK:                                Summary
-CHECK-NEXT: ============================================================
-CHECK-NEXT:  Block Size: 4096
-CHECK-NEXT:  Number of blocks:
-CHECK-NEXT:  Number of streams:
-CHECK-NEXT:  Signature: 1424295906
-CHECK-NEXT:  Age: 1
-CHECK-NEXT:  GUID: {0B355641-86A0-A249-896F-9988FAE52FF0}
-CHECK-NEXT:  Features: 0x1
-CHECK-NEXT:  Has Debug Info: true
-CHECK-NEXT:  Has Types: true
-CHECK-NEXT:  Has IDs: true
-CHECK-NEXT:  Has Globals:
-CHECK-NEXT:  Has Publics:
-CHECK-NEXT:  Is incrementally linked: true
-CHECK-NEXT:  Has conflicting types: false
-CHECK-NEXT:  Is stripped: false
-CHECK:                             String Table
-CHECK-NEXT: ============================================================
-CHECK-NEXT:   ID    | String
-CHECK-NEXT:  {{.*}} | 'd:\src\llvm\test\debuginfo\pdb\inputs\predefined c++ attributes (compiler internal)'
-CHECK-NEXT:  {{.*}} | 'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
-CHECK-NEXT:  {{.*}} | '$T0 $ebp = $eip $T0 4 + ^ = $ebp $T0 ^ = $esp $T0 8 + = '
-CHECK:                          Types (TPI Stream)
-CHECK-NEXT: ============================================================
-CHECK-NEXT:  Showing 75 records
+CHECK:      FileHeaders {
+CHECK-NEXT:   BlockSize: 4096
+CHECK-NEXT:   FreeBlockMap:
+CHECK-NEXT:   NumBlocks:
+CHECK-NEXT:   NumDirectoryBytes:
+CHECK-NEXT:   Unknown1: 0
+CHECK-NEXT:   BlockMapAddr:
+CHECK-NEXT:   NumDirectoryBlocks: 1
+CHECK-NEXT:   DirectoryBlocks:
+CHECK-NEXT:   NumStreams:
+CHECK-NEXT: }
+CHECK:      String Table {
+CHECK-DAG:   'd:\src\llvm\test\debuginfo\pdb\inputs\predefined c++ attributes (compiler internal)'
+CHECK-DAG:   'd:\src\llvm\test\debuginfo\pdb\inputs\empty.cpp'
+CHECK-DAG:   '$T0 $ebp = $eip $T0 4 + ^ = $ebp $T0 ^ = $esp $T0 8 + = '
+CHECK-NEXT: }
+CHECK:      PDB Stream {
+CHECK-NEXT:   Version: 20000404
+CHECK-NEXT:   Signature: 0x54E507E2
+CHECK-NEXT:   Age: 1
+CHECK-NEXT:   Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
+CHECK-NEXT:   Features: 0x1
+CHECK-NEXT:   Named Streams {
+CHECK:          /names: 
+CHECK:        }
+CHECK-NEXT: }
+CHECK:      Type Info Stream (TPI) {
+CHECK-NEXT:   TPI Version: 20040203
+CHECK-NEXT:   Record count: 75
+CHECK:      DBI Stream {
+CHECK-NEXT:   Dbi Version: 19990903
+CHECK-NEXT:   Age: 1
+CHECK-NEXT:   Incremental Linking: Yes
+CHECK-NEXT:   Has CTypes: No
+CHECK-NEXT:   Is Stripped: No
+CHECK-NEXT:   Machine Type: x86
+CHECK-NEXT:   Symbol Record Stream Index:
+CHECK-NEXT:   Public Symbol Stream Index:
+CHECK-NEXT:   Global Symbol Stream Index:
+CHECK-NEXT:   Toolchain Version: 12.0
+CHECK-NEXT:   mspdb120.dll version: 12.0.31101
+CHECK-NEXT: }