Author: labath
Date: Thu Apr 20 06:27:58 2017
New Revision: 300833
URL: http://llvm.org/viewvc/llvm-project?rev=300833&view=rev
Log:
Add libc++ category the three more tests
I thought my previous commit got the last ones but somehow I missed
these. This also resurrects TestDataFormatterLibcxxSet, which got
commented out in r263859 as a part of some seemingly unrelated change.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py?rev=300833&r1=300832&r2=300833&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/TestLibCxxAtomic.py
Thu Apr 20 06:27:58 2017
@@ -23,8 +23,7 @@ class LibCxxAtomicTestCase(TestBase):
var.SetPreferSyntheticValue(True)
return var
- @skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @add_test_categories(["libc++"])
def test(self):
"""Test that std::atomic as defined by libc++ is correctly printed by
LLDB"""
self.build()
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py?rev=300833&r1=300832&r2=300833&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
Thu Apr 20 06:27:58 2017
@@ -30,8 +30,7 @@ class LibcxxListDataFormatterTestCase(Te
self.line4 = line_number('main.cpp',
'// Set fourth break point at this line.')
- @skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @add_test_categories(["libc++"])
def test_with_run_command(self):
"""Test that that file and class static variables display correctly."""
self.build()
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py?rev=300833&r1=300832&r2=300833&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
Thu Apr 20 06:27:58 2017
@@ -17,55 +17,112 @@ class LibcxxSetDataFormatterTestCase(Tes
mydir = TestBase.compute_mydir(__file__)
- @skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ def setUp(self):
+ TestBase.setUp(self)
+ ns = 'ndk' if lldbplatformutil.target_is_android() else ''
+ self.namespace = 'std::__' + ns + '1'
+
+ def getVariableType(self, name):
+ var = self.frame().FindVariable(name)
+ self.assertTrue(var.IsValid())
+ return var.GetType().GetCanonicalType().GetName()
+
+ @add_test_categories(["libc++"])
def test_with_run_command(self):
"""Test that that file and class static variables display correctly."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
-# bkpt =
self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self,
"Set break point at this line."))
+ bkpt = self.target().FindBreakpointByID(
+ lldbutil.run_break_set_by_source_regexp(self, "Set break point at
this line."))
self.runCmd("run", RUN_SUCCEEDED)
-# lldbutil.skip_if_library_missing(self, self.target(),
lldbutil.PrintableRegex("libc\+\+"))
-#
-# # The stop reason of the thread should be breakpoint.
-# self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-# substrs = ['stopped',
-# 'stop reason = breakpoint'])
-#
-# # This is the function to remove the custom formats in order to have a
-# # clean slate for the next test case.
-# def cleanup():
-# self.runCmd('type format clear', check=False)
-# self.runCmd('type summary clear', check=False)
-# self.runCmd('type filter clear', check=False)
-# self.runCmd('type synth clear', check=False)
-# self.runCmd("settings set target.max-children-count 256",
check=False)
-#
-# # Execute the cleanup function during test case tear down.
-# self.addTearDownHook(cleanup)
-#
-# self.expect('image list', substrs = self.getLibcPlusPlusLibs())
-#
-# self.expect("frame variable ii",substrs = ["size=0","{}"])
-# lldbutil.continue_to_breakpoint(self.process(), bkpt)
-# self.expect("frame variable ii",substrs = ["size=6","[0] = 0","[1] =
1", "[2] = 2", "[3] = 3", "[4] = 4", "[5] = 5"])
-# lldbutil.continue_to_breakpoint(self.process(), bkpt)
-# self.expect("frame variable ii",substrs = ["size=7","[2] = 2", "[3] =
3", "[6] = 6"])
-# self.expect("frame variable ii[2]",substrs = [" = 2"])
-# self.expect("p ii",substrs = ["size=7","[2] = 2", "[3] = 3", "[6] =
6"])
-# lldbutil.continue_to_breakpoint(self.process(), bkpt)
-# self.expect("frame variable ii",substrs = ["size=0","{}"])
-# lldbutil.continue_to_breakpoint(self.process(), bkpt)
-# self.expect("frame variable ii",substrs = ["size=0","{}"])
-# self.expect("frame variable ss",substrs = ["size=0","{}"])
-# lldbutil.continue_to_breakpoint(self.process(), bkpt)
-# self.expect("frame variable ss",substrs = ["size=2",'[0] = "a"','[1]
= "a very long string is right here"'])
-# lldbutil.continue_to_breakpoint(self.process(), bkpt)
-# self.expect("frame variable ss",substrs = ["size=4",'[2] = "b"','[3]
= "c"','[0] = "a"','[1] = "a very long string is right here"'])
-# self.expect("p ss",substrs = ["size=4",'[2] = "b"','[3] = "c"','[0] =
"a"','[1] = "a very long string is right here"'])
-# self.expect("frame variable ss[2]",substrs = [' = "b"'])
-# lldbutil.continue_to_breakpoint(self.process(), bkpt)
-# self.expect("frame variable ss",substrs = ["size=3",'[0] = "a"','[1]
= "a very long string is right here"','[2] = "c"'])
+ # The stop reason of the thread should be breakpoint.
+ self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
+
+ # This is the function to remove the custom formats in order to have a
+ # clean slate for the next test case.
+ def cleanup():
+ self.runCmd('type format clear', check=False)
+ self.runCmd('type summary clear', check=False)
+ self.runCmd('type filter clear', check=False)
+ self.runCmd('type synth clear', check=False)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
+
+ # Execute the cleanup function during test case tear down.
+ self.addTearDownHook(cleanup)
+
+ ii_type = self.getVariableType("ii")
+ self.assertTrue(ii_type.startswith(self.namespace + "::set"),
+ "Type: " + ii_type)
+
+ self.expect("frame variable ii", substrs=["size=0", "{}"])
+ lldbutil.continue_to_breakpoint(self.process(), bkpt)
+ self.expect(
+ "frame variable ii",
+ substrs=["size=6",
+ "[0] = 0",
+ "[1] = 1",
+ "[2] = 2",
+ "[3] = 3",
+ "[4] = 4",
+ "[5] = 5"])
+ lldbutil.continue_to_breakpoint(self.process(), bkpt)
+ self.expect(
+ "frame variable ii",
+ substrs=["size=7",
+ "[2] = 2",
+ "[3] = 3",
+ "[6] = 6"])
+ self.expect("frame variable ii[2]", substrs=[" = 2"])
+ self.expect(
+ "p ii",
+ substrs=[
+ "size=7",
+ "[2] = 2",
+ "[3] = 3",
+ "[6] = 6"])
+ lldbutil.continue_to_breakpoint(self.process(), bkpt)
+ self.expect("frame variable ii", substrs=["size=0", "{}"])
+ lldbutil.continue_to_breakpoint(self.process(), bkpt)
+ self.expect("frame variable ii", substrs=["size=0", "{}"])
+
+ ss_type = self.getVariableType("ss")
+ self.assertTrue(ii_type.startswith(self.namespace + "::set"),
+ "Type: " + ss_type)
+
+ self.expect("frame variable ss", substrs=["size=0", "{}"])
+ lldbutil.continue_to_breakpoint(self.process(), bkpt)
+ self.expect(
+ "frame variable ss",
+ substrs=["size=2",
+ '[0] = "a"',
+ '[1] = "a very long string is right here"'])
+ lldbutil.continue_to_breakpoint(self.process(), bkpt)
+ self.expect(
+ "frame variable ss",
+ substrs=["size=4",
+ '[2] = "b"',
+ '[3] = "c"',
+ '[0] = "a"',
+ '[1] = "a very long string is right here"'])
+ self.expect(
+ "p ss",
+ substrs=["size=4",
+ '[2] = "b"',
+ '[3] = "c"',
+ '[0] = "a"',
+ '[1] = "a very long string is right here"'])
+ self.expect("frame variable ss[2]", substrs=[' = "b"'])
+ lldbutil.continue_to_breakpoint(self.process(), bkpt)
+ self.expect(
+ "frame variable ss",
+ substrs=["size=3",
+ '[0] = "a"',
+ '[1] = "a very long string is right here"',
+ '[2] = "c"'])
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
