Author: labath Date: Fri Jan 11 10:24:17 2019 New Revision: 350947 URL: http://llvm.org/viewvc/llvm-project?rev=350947&view=rev Log: Attempt to fix PDB tests broken by r350924
The patch added the symbol plugin name to the lldb-test output. Update the tests to account for that. Modified: lldb/trunk/lit/SymbolFile/PDB/class-layout.test lldb/trunk/lit/SymbolFile/PDB/compilands.test lldb/trunk/lit/SymbolFile/PDB/func-symbols.test lldb/trunk/lit/SymbolFile/PDB/type-quals.test lldb/trunk/lit/SymbolFile/PDB/typedefs.test lldb/trunk/lit/SymbolFile/PDB/variables.test Modified: lldb/trunk/lit/SymbolFile/PDB/class-layout.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/class-layout.test?rev=350947&r1=350946&r2=350947&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/class-layout.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/class-layout.test Fri Jan 11 10:24:17 2019 @@ -13,7 +13,7 @@ RUN: lldb-test symbols %T/ClassLayoutTes RUN: lldb-test symbols %T/ClassLayoutTest.cpp.exe | FileCheck --check-prefix=CLASS %s CHECK: Module [[MOD:.*]] -CHECK: {{^[0-9A-F]+}}: SymbolVendor ([[MOD]]) +CHECK: {{^[0-9A-F]+}}: SymbolVendor pdb ([[MOD]]) CHECK: {{^[0-9A-F]+}}: CompileUnit{{[{]0x[0-9a-f]+[}]}}, language = "c++", file = '{{.*}}\ClassLayoutTest.cpp' ENUM: name = "Enum", size = 4, decl = ClassLayoutTest.cpp:5 Modified: lldb/trunk/lit/SymbolFile/PDB/compilands.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/compilands.test?rev=350947&r1=350946&r2=350947&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/compilands.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/compilands.test Fri Jan 11 10:24:17 2019 @@ -7,5 +7,5 @@ RUN: env LLDB_USE_NATIVE_PDB_READER=0 ll ; Link default libraries CHECK: Module [[CU:.*]] -CHECK: {{^[0-9A-F]+}}: SymbolVendor ([[CU]]) +CHECK: {{^[0-9A-F]+}}: SymbolVendor pdb ([[CU]]) CHECK: {{^[0-9A-F]+}}: CompileUnit{{[{]0x[0-9a-f]+[}]}}, language = "c++", file = '{{.*}}\CompilandsTest.cpp' Modified: lldb/trunk/lit/SymbolFile/PDB/func-symbols.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/func-symbols.test?rev=350947&r1=350946&r2=350947&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/func-symbols.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/func-symbols.test Fri Jan 11 10:24:17 2019 @@ -7,7 +7,7 @@ RUN: lldb-test symbols %T/FuncSymbolsTes ; In this test, We don't check demangled name of a mangled function. CHECK-ONE: Module [[MD:.*]] -CHECK-ONE-DAG: {{.*}}: SymbolVendor ([[MD]]) +CHECK-ONE-DAG: {{.*}}: SymbolVendor pdb ([[MD]]) CHECK-ONE-DAG: [[TY0:.*]]: Type{[[UID0:.*]]} , name = "Func_arg_array", decl = FuncSymbolsTestMain.cpp:3, compiler_type = {{.*}} int (int *) CHECK-ONE-DAG: [[TY1:.*]]: Type{[[UID1:.*]]} , name = "Func_arg_void", decl = FuncSymbolsTestMain.cpp:4, compiler_type = {{.*}} void (void) CHECK-ONE-DAG: [[TY2:.*]]: Type{[[UID2:.*]]} , name = "Func_arg_none", decl = FuncSymbolsTestMain.cpp:5, compiler_type = {{.*}} void (void) Modified: lldb/trunk/lit/SymbolFile/PDB/type-quals.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/type-quals.test?rev=350947&r1=350946&r2=350947&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/type-quals.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/type-quals.test Fri Jan 11 10:24:17 2019 @@ -4,7 +4,7 @@ RUN: %build --compiler=msvc --mode=link RUN: lldb-test symbols %T/TypeQualsTest.cpp.exe | FileCheck %s CHECK: Module [[MOD:.*]] -CHECK-DAG: {{^[0-9A-F]+}}: SymbolVendor ([[MOD]]) +CHECK-DAG: {{^[0-9A-F]+}}: SymbolVendor pdb ([[MOD]]) CHECK-DAG: Type{{.*}} , name = "const int", size = 4, compiler_type = {{.*}} const int CHECK-DAG: Type{{.*}} , size = 4, compiler_type = {{.*}} const int * CHECK-DAG: Type{{.*}} , size = 4, compiler_type = {{.*}} const int **const Modified: lldb/trunk/lit/SymbolFile/PDB/typedefs.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/typedefs.test?rev=350947&r1=350946&r2=350947&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/typedefs.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/typedefs.test Fri Jan 11 10:24:17 2019 @@ -12,7 +12,7 @@ RUN: lldb-test symbols %T/SimpleTypesTes ; both of them is the same. CHECK: Module [[MOD:.*]] -CHECK: {{^[0-9A-F]+}}: SymbolVendor ([[MOD]]) +CHECK: {{^[0-9A-F]+}}: SymbolVendor pdb ([[MOD]]) CHECK-DAG: name = "char32_t", size = 4, compiler_type = {{.*}} char32_t CHECK-DAG: name = "char16_t", size = 2, compiler_type = {{.*}} char16_t CHECK-DAG: Type{{.*}} , name = "unsigned long", size = 4, compiler_type = {{.*}} unsigned long Modified: lldb/trunk/lit/SymbolFile/PDB/variables.test URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/SymbolFile/PDB/variables.test?rev=350947&r1=350946&r2=350947&view=diff ============================================================================== --- lldb/trunk/lit/SymbolFile/PDB/variables.test (original) +++ lldb/trunk/lit/SymbolFile/PDB/variables.test Fri Jan 11 10:24:17 2019 @@ -9,7 +9,7 @@ RUN: FileCheck --check-prefix=FUNC-CONST RUN: FileCheck --check-prefix=FUNC-MEMBER --input-file=%T/VariablesTest.out %s GLOBALS: Module [[MOD:.*]] -GLOBALS: SymbolVendor ([[MOD]]) +GLOBALS: SymbolVendor pdb ([[MOD]]) GLOBALS: CompileUnit{{.*}}, language = "c++", file = '{{.*}}\VariablesTest.cpp' GLOBALS-DAG: Variable{{.*}}, name = "g_IntVar" GLOBALS-SAME: scope = global, location = {{.*}}, external _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits