summaryrefslogtreecommitdiffstats
path: root/lldb/test/lang/cpp/class_static/TestStaticVariables.py
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/test/lang/cpp/class_static/TestStaticVariables.py')
-rw-r--r--lldb/test/lang/cpp/class_static/TestStaticVariables.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
index 6efd7b030dd..fad69a2d13c 100644
--- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
@@ -20,8 +20,6 @@ class StaticVariableTestCase(TestBase):
self.buildDsym()
self.static_variable_commands()
- @expectedFailureFreeBSD('llvm.org/pr15261', failing_compilers) # lldb on FreeBSD does not display the size of (class or file)static arrays
- @expectedFailureLinux('llvm.org/pr15261', failing_compilers) # lldb on Linux does not display the size of (class or file)static arrays
@dwarf_test
def test_with_dwarf_and_run_command(self):
"""Test that file and class static variables display correctly."""
@@ -69,13 +67,13 @@ class StaticVariableTestCase(TestBase):
# 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'])
+ patterns=['\(PointType \[[1-9]*\]\) 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']:
+ if sys.platform.startswith("darwin") or sys.platform.startswith("linux"):
self.expect("target variable A::g_points[1].x", VARIABLES_DISPLAYED_CORRECTLY,
startstr = "(int) A::g_points[1].x = 11")
OpenPOWER on IntegriCloud