diff options
| -rw-r--r-- | lldb/test/lang/cpp/class_static/TestStaticVariables.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py index 51545344aed..966cee34a2f 100644 --- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py +++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py @@ -57,18 +57,16 @@ class StaticVariableTestCase(TestBase): substrs = ['stopped', 'stop reason = breakpoint']) - # On Mac OS X, gcc 4.2 emits the wrong debug info for A::g_points. - slist = ['(PointType [2]) g_points', 'A::g_points'] - -# global variables are no longer displayed with the "frame variable" command. -# add tests for the "target variable" command soon - # 'frame variable -G' finds and displays global variable(s) by name. - # self.expect('frame variable -G g_points', VARIABLES_DISPLAYED_CORRECTLY, - # substrs = slist) + # global variables are no longer displayed with the "frame variable" command. + self.expect('target variable A::g_points', VARIABLES_DISPLAYED_CORRECTLY, + substrs = ['(PointType [2]) A::g_points']) + self.expect('target variable g_points', VARIABLES_DISPLAYED_CORRECTLY, + substrs = ['(PointType [2]) g_points']) + # On Mac OS X, gcc 4.2 emits the wrong debug info for A::g_points. # A::g_points is an array of two elements. if sys.platform.startswith("darwin") and self.getCompiler() in ['clang', 'llvm-gcc']: - self.expect("frame variable A::g_points[1].x", VARIABLES_DISPLAYED_CORRECTLY, + self.expect("target variable A::g_points[1].x", VARIABLES_DISPLAYED_CORRECTLY, startstr = "(int) A::g_points[1].x = 11") def static_variable_python(self): |
