Skip to content

Commit e95e64f

Browse files
Michael137Debadri Basak
authored andcommitted
🍒 [lldb] Fix TestRealDefinition on older DWARF versions (llvm#165729)
Cherry-picks this fix from the Apple LLDB fork. Ever since we upstreamed llvm#164011, this test is failing on our pre-DWARFv5 bots: ``` 13:47:54 ====================================================================== 13:47:54 FAIL: test_frame_var_after_stop_at_implementation_dsym (TestRealDefinition.TestRealDefinition) 13:47:54 Test that we can find the implementation for an objective C type 13:47:54 ---------------------------------------------------------------------- 13:47:54 Traceback (most recent call last): 13:47:54 File "/Users/ec2-user/jenkins/workspace/llvm.org/lldb-cmake-matrix/llvm-project/lldb/packages/Python/lldbsuite/test/lldbtest.py", line 1804, in test_method 13:47:54 return attrvalue(self) 13:47:54 File "/Users/ec2-user/jenkins/workspace/llvm.org/lldb-cmake-matrix/llvm-project/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py", line 60, in test_frame_var_after_stop_at_implementation 13:47:54 self.expect( 13:47:54 File "/Users/ec2-user/jenkins/workspace/llvm.org/lldb-cmake-matrix/llvm-project/lldb/packages/Python/lldbsuite/test/lldbtest.py", line 2416, in expect 13:47:54 self.runCmd( 13:47:54 File "/Users/ec2-user/jenkins/workspace/llvm.org/lldb-cmake-matrix/llvm-project/lldb/packages/Python/lldbsuite/test/lldbtest.py", line 1006, in runCmd 13:47:54 self.assertTrue(self.res.Succeeded(), msg + output) 13:47:54 AssertionError: False is not true : Variable(s) displayed correctly 13:47:54 Error output: 13:47:54 error: <user expression 0>:1:12: "_hidden_ivar" is not a member of "(id) _bar" 13:47:54 1 | foo->_bar->_hidden_ivar 13:47:54 | ^ ``` Original commit message: For a while, tests were run with `target.prefer-dynamic-value` overridden to `no-dynamic-values` – but the override was removed in [D132382](https://reviews.llvm.org/D132382). At that time, tests that failed were individually opted in to `no-dynamic-values`. I don't recall specifics about `TestRealDefinition`, but it currently fails with `no-dynamic-values`, and that is correct behavior. This change removes the `no-dynamic-values` override.
1 parent caf1fea commit e95e64f

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

lldb/test/API/lang/objc/real-definition/TestRealDefinition.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ def test_frame_var_after_stop_at_interface(self):
2727
# Run at stop at main
2828
lldbutil.check_breakpoint(self, bpno=1, expected_hit_count=1)
2929

30-
self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values")
31-
3230
# This should display correctly.
3331
self.expect(
3432
"frame variable foo->_bar->_hidden_ivar",
3533
VARIABLES_DISPLAYED_CORRECTLY,
36-
substrs=["(NSString *)", "foo->_bar->_hidden_ivar = 0x"],
34+
substrs=["foo->_bar->_hidden_ivar = 0x"],
3735
)
3836

3937
def test_frame_var_after_stop_at_implementation(self):
@@ -54,11 +52,9 @@ def test_frame_var_after_stop_at_implementation(self):
5452
# Run at stop at main
5553
lldbutil.check_breakpoint(self, bpno=1, expected_hit_count=1)
5654

57-
self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values")
58-
5955
# This should display correctly.
6056
self.expect(
6157
"frame variable foo->_bar->_hidden_ivar",
6258
VARIABLES_DISPLAYED_CORRECTLY,
63-
substrs=["(NSString *)", "foo->_bar->_hidden_ivar = 0x"],
59+
substrs=["foo->_bar->_hidden_ivar = 0x"],
6460
)

0 commit comments

Comments
 (0)