1 files changed, 12 insertions, 11 deletions
diff --git a/test/NaCl/Bitcode/struct-types.ll b/test/NaCl/Bitcode/struct-types.ll
index a36e6bb0ab..b2f7dc62a8 100644
--- a/test/NaCl/Bitcode/struct-types.ll
+++ b/test/NaCl/Bitcode/struct-types.ll
@@ -2,7 +2,8 @@
 ; even if the struct definintion appears after the pointer type, while
 ; pnacl bitcode moves the pointer before the struct.
 ; RUN: llvm-as < %s | llvm-bcanalyzer -dump | FileCheck %s -check-prefix=LLVM
-; RUN: llvm-as < %s | pnacl-freeze | pnacl-bcanalyzer -dump | FileCheck %s -check-prefix=PNACL
+; RUN: llvm-as < %s | pnacl-freeze | pnacl-bcanalyzer -dump-records \
+; RUN:              | FileCheck %s -check-prefix=PNACL
 
 %typeB = type { i8, %typeA, i32, %typeA }
 %typeA = type { i16 }
@@ -50,29 +51,29 @@ define i16 @bam(i16 %a) {
 ; LLVM: </TYPE_BLOCK_ID>
 
 ; Show the ordering pnacl-freeze uses to order types.
-; PNACL: <TYPE_BLOCK_ID {{.*}}>
+; PNACL: <TYPE_BLOCK_ID>
 ;          %typeB*
-; PNACL:   <POINTER abbrevid=4 op0=8 op1=0/>
+; PNACL:   <POINTER op0=8 op1=0/>
 ;          i16
 ; PNACL:   <INTEGER op0=16/>
 ;          type of instruction "RET"
 ; PNACL:   <VOID/>
 ;          %typeA = type { i16 }
-; PNACL:   <STRUCT_NAME abbrevid=7 op0=116 op1=121 op2=112 op3=101 op4=65/>
-; PNACL:   <STRUCT_NAMED abbrevid=8 op0=0 op1=1/>
+; PNACL:   <STRUCT_NAME op0=116 op1=121 op2=112 op3=101 op4=65/>
+; PNACL:   <STRUCT_NAMED op0=0 op1=1/>
 ;          %typeB* (%typeB*)
-; PNACL:   <FUNCTION abbrevid=5 op0=0 op1=0 op2=0/>
+; PNACL:   <FUNCTION op0=0 op1=0 op2=0/>
 ;          %typeB* (%typeB*)*
-; PNACL:   <POINTER abbrevid=4 op0=4 op1=0/>
+; PNACL:   <POINTER op0=4 op1=0/>
 ;          i8
 ; PNACL:   <INTEGER op0=8/>
 ;          i32
 ; PNACL:   <INTEGER op0=32/>
 ;          %typeB = type { i8, %typeA, i32, %typeA }
-; PNACL:   <STRUCT_NAME abbrevid=7 op0=116 op1=121 op2=112 op3=101 op4=66/>
-; PNACL:   <STRUCT_NAMED abbrevid=8 op0=0 op1=6 op2=3 op3=7 op4=3/>
+; PNACL:   <STRUCT_NAME op0=116 op1=121 op2=112 op3=101 op4=66/>
+; PNACL:   <STRUCT_NAMED op0=0 op1=6 op2=3 op3=7 op4=3/>
 ;          i16 (i16)
-; PNACL:   <FUNCTION abbrevid=5 op0=0 op1=1 op2=1/>
+; PNACL:   <FUNCTION op0=0 op1=1 op2=1/>
 ;          i16 (i16)*
-; PNACL:   <POINTER abbrevid=4 op0=9 op1=0/>
+; PNACL:   <POINTER op0=9 op1=0/>
 ; PNACL: </TYPE_BLOCK_ID>