Skip to content

Commit 422d240

Browse files
committed
Relax tests to also work with newer versions of lldb.
- result variables are optional - static members may print their values - public/protected shows up in ptype output
1 parent fd32e74 commit 422d240

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

cross-project-tests/debuginfo-tests/llgdb-tests/static-member-2.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
// XFAIL: gdb-clang-incompatibility
55

66
// DEBUGGER: delete breakpoints
7-
// DEBUGGER: break static-member.cpp:33
7+
// DEBUGGER: break static-member-2.cpp:36
88
// DEBUGGER: r
99
// DEBUGGER: ptype C
1010
// CHECK: {{struct|class}} C {
11-
// CHECK: static const int a;
11+
// CHECK: static const int a
1212
// CHECK-NEXT: static int b;
1313
// CHECK-NEXT: static int c;
14-
// CHECK-NEXT: int d;
14+
// CHECK: int d;
1515
// CHECK-NEXT: }
1616
// DEBUGGER: p C::a
17-
// CHECK: ${{[0-9]}} = 4
17+
// CHECK: 4
1818
// DEBUGGER: p C::c
19-
// CHECK: ${{[0-9]}} = 15
19+
// CHECK: 15
2020

2121
// PR14471, PR14734
2222

cross-project-tests/debuginfo-tests/llgdb-tests/static-member.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// RUN: %test_debuginfo %s %t.out
44
// XFAIL: !system-darwin && gdb-clang-incompatibility
55
// DEBUGGER: delete breakpoints
6-
// DEBUGGER: break static-member.cpp:33
6+
// DEBUGGER: break static-member.cpp:35
77
// DEBUGGER: r
88
// DEBUGGER: ptype MyClass
99
// CHECK: {{struct|class}} MyClass {
10-
// CHECK: static const int a;
10+
// CHECK: static const int a
1111
// CHECK-NEXT: static int b;
1212
// CHECK-NEXT: static int c;
13-
// CHECK-NEXT: int d;
13+
// CHECK: int d;
1414
// CHECK-NEXT: }
1515
// DEBUGGER: p MyClass::a
1616
// CHECK: ${{[0-9]}} = 4

0 commit comments

Comments
 (0)