From 11faff592d5e67c5f265bf07972144905c897ca1 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Wed, 10 Feb 2016 18:17:17 +0000
Subject: [PATCH] [pdbdump] Fix test for different type ordering with DIA 2015

llvm-svn: 260396
---
 .../DebugInfo/PDB/DIA/pdbdump-symbol-format.test   | 53 ++++++++++++----------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/llvm/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test b/llvm/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test
index ea5bb13d..2393510 100644
--- a/llvm/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test
+++ b/llvm/test/DebugInfo/PDB/DIA/pdbdump-symbol-format.test
@@ -1,4 +1,8 @@
 ; RUN: llvm-pdbdump -symbols %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=SYM_FORMAT %s
+; RUN: llvm-pdbdump -types %p/../Inputs/symbolformat.pdb > %t.types
+; RUN: FileCheck --check-prefix=TYPES_FORMAT %s < %t.types
+; RUN: FileCheck --check-prefix=TYPES_1 %s < %t.types
+; RUN: FileCheck --check-prefix=TYPES_2 %s < %t.types
 ; RUN: llvm-pdbdump -types %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=TYPES_FORMAT %s
 ; RUN: llvm-pdbdump -globals %p/../Inputs/symbolformat.pdb | FileCheck --check-prefix=GLOBALS %s
 
@@ -23,29 +27,32 @@
 ; TYPES_FORMAT: Typedefs
 ; TYPES_FORMAT-DAG: typedef int IntType
 ; TYPES_FORMAT-DAG: typedef class A ClassAType
-; TYPES_FORMAT: Classes
-; TYPES_FORMAT: struct A {
-; TYPES_FORMAT: public:
-; TYPES_FORMAT: virtual void PureFunc() = 0
-; TYPES_FORMAT: virtual void VirtualFunc()
-; TYPES_FORMAT: void RegularFunc()
-; TYPES_FORMAT: }
-; TYPES_FORMAT-DAG: struct MemberTest {
-; TYPES_FORMAT: data +0x00 MemberTest::NestedEnum m_nested_enum
-; TYPES_FORMAT: data +0x04 int m_typedef
-; TYPES_FORMAT: data +0x08 bool m_bool
-; TYPES_FORMAT: data +0x09 char m_char
-; TYPES_FORMAT: data +0x0a wchar_t m_wchar_t
-; TYPES_FORMAT: data +0x0c int m_int
-; TYPES_FORMAT: data +0x10 unsigned m_unsigned
-; TYPES_FORMAT: data +0x14 long m_long
-; TYPES_FORMAT: data +0x18 unsigned long m_unsigned_long
-; TYPES_FORMAT: data +0x20 __int64 m_int64
-; TYPES_FORMAT: data +0x28 unsigned __int64 m_unsigned_int64
-; TYPES_FORMAT: data +0x30 float m_float
-; TYPES_FORMAT: data +0x38 double m_double
-; TYPES_FORMAT: data +0x40 void (__cdecl *m_pfn_2_args)(int, double)
-; TYPES_FORMAT: }
+
+; TYPES_1: Classes
+; TYPES_1: struct A {
+; TYPES_1: public:
+; TYPES_1: virtual void PureFunc() = 0
+; TYPES_1: virtual void VirtualFunc()
+; TYPES_1: void RegularFunc()
+; TYPES_1: }
+
+; TYPES_2: Classes
+; TYPES_2: struct MemberTest {
+; TYPES_2: data +0x00 MemberTest::NestedEnum m_nested_enum
+; TYPES_2: data +0x04 int m_typedef
+; TYPES_2: data +0x08 bool m_bool
+; TYPES_2: data +0x09 char m_char
+; TYPES_2: data +0x0a wchar_t m_wchar_t
+; TYPES_2: data +0x0c int m_int
+; TYPES_2: data +0x10 unsigned m_unsigned
+; TYPES_2: data +0x14 long m_long
+; TYPES_2: data +0x18 unsigned long m_unsigned_long
+; TYPES_2: data +0x20 __int64 m_int64
+; TYPES_2: data +0x28 unsigned __int64 m_unsigned_int64
+; TYPES_2: data +0x30 float m_float
+; TYPES_2: data +0x38 double m_double
+; TYPES_2: data +0x40 void (__cdecl *m_pfn_2_args)(int, double)
+; TYPES_2: }
 
 ; GLOBALS: ---GLOBALS---
 ; GLOBALS-DAG: func [{{.*}}] (FPO) unsigned __cdecl fpo_func(unsigned n)
-- 
2.7.4