[Lldb-commits] [lldb] r280751 - *** This commit represents a complete reformatting of the LLDB source code
Kate Stone via lldb-commits
lldb-commits at lists.llvm.org
Tue Sep 6 13:58:36 PDT 2016
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,12 @@ Test calling a function that waits a whi
from __future__ import print_function
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class ExprCommandWithTimeoutsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -20,11 +20,14 @@ class ExprCommandWithTimeoutsTestCase(Te
TestBase.setUp(self)
self.main_source = "wait-a-while.cpp"
- self.main_source_spec = lldb.SBFileSpec (self.main_source)
-
+ self.main_source_spec = lldb.SBFileSpec(self.main_source)
@expectedFlakeyFreeBSD("llvm.org/pr19605")
- @expectedFailureAll(oslist=["windows", "macosx"], bugnumber="llvm.org/pr21765")
+ @expectedFailureAll(
+ oslist=[
+ "windows",
+ "macosx"],
+ bugnumber="llvm.org/pr21765")
def test(self):
"""Test calling std::String member function."""
self.build()
@@ -35,58 +38,65 @@ class ExprCommandWithTimeoutsTestCase(Te
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
- breakpoint = target.BreakpointCreateBySourceRegex('stop here in main.',self.main_source_spec)
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ 'stop here in main.', self.main_source_spec)
self.assertTrue(breakpoint, VALID_BREAKPOINT)
self.runCmd("breakpoint list")
# Launch the process, and do not stop at the entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
# Frame #0 should be on self.step_out_of_malloc.
- threads = lldbutil.get_threads_stopped_at_breakpoint (process, breakpoint)
-
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ process, breakpoint)
+
self.assertTrue(len(threads) == 1)
thread = threads[0]
-
+
# First set the timeout too short, and make sure we fail.
options = lldb.SBExpressionOptions()
options.SetTimeoutInMicroSeconds(10)
options.SetUnwindOnError(True)
frame = thread.GetFrameAtIndex(0)
-
+
value = frame.EvaluateExpression("wait_a_while(1000000)", options)
- self.assertTrue (value.IsValid())
- self.assertFalse (value.GetError().Success())
+ self.assertTrue(value.IsValid())
+ self.assertFalse(value.GetError().Success())
- # Now do the same thing with the command line command, and make sure it works too.
+ # Now do the same thing with the command line command, and make sure it
+ # works too.
interp = self.dbg.GetCommandInterpreter()
result = lldb.SBCommandReturnObject()
- return_value = interp.HandleCommand("expr -t 100 -u true -- wait_a_while(1000000)", result)
- self.assertTrue (return_value == lldb.eReturnStatusFailed)
+ return_value = interp.HandleCommand(
+ "expr -t 100 -u true -- wait_a_while(1000000)", result)
+ self.assertTrue(return_value == lldb.eReturnStatusFailed)
# Okay, now do it again with long enough time outs:
options.SetTimeoutInMicroSeconds(1000000)
- value = frame.EvaluateExpression ("wait_a_while (1000)", options)
+ value = frame.EvaluateExpression("wait_a_while (1000)", options)
self.assertTrue(value.IsValid())
- self.assertTrue (value.GetError().Success() == True)
-
- # Now do the same thingwith the command line command, and make sure it works too.
+ self.assertTrue(value.GetError().Success())
+
+ # Now do the same thingwith the command line command, and make sure it
+ # works too.
interp = self.dbg.GetCommandInterpreter()
result = lldb.SBCommandReturnObject()
- return_value = interp.HandleCommand ("expr -t 1000000 -u true -- wait_a_while(1000)", result)
+ return_value = interp.HandleCommand(
+ "expr -t 1000000 -u true -- wait_a_while(1000)", result)
self.assertTrue(return_value == lldb.eReturnStatusSuccessFinishResult)
-
- # Finally set the one thread timeout and make sure that doesn't change things much:
+ # Finally set the one thread timeout and make sure that doesn't change
+ # things much:
options.SetTimeoutInMicroSeconds(1000000)
options.SetOneThreadTimeoutInMicroSeconds(500000)
- value = frame.EvaluateExpression ("wait_a_while (1000)", options)
+ value = frame.EvaluateExpression("wait_a_while (1000)", options)
self.assertTrue(value.IsValid())
- self.assertTrue (value.GetError().Success() == True)
+ self.assertTrue(value.GetError().Success())
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/top-level/TestTopLevelExprs.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/top-level/TestTopLevelExprs.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/top-level/TestTopLevelExprs.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/top-level/TestTopLevelExprs.py Tue Sep 6 15:57:50 2016
@@ -5,15 +5,16 @@ Test top-level expressions.
from __future__ import print_function
-
import unittest2
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TopLevelExpressionsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,8 +30,8 @@ class TopLevelExpressionsTestCase(TestBa
# Disable confirmation prompt to avoid infinite wait
self.runCmd("settings set auto-confirm true")
- self.addTearDownHook(lambda: self.runCmd("settings clear auto-confirm"))
-
+ self.addTearDownHook(
+ lambda: self.runCmd("settings clear auto-confirm"))
def build_and_run(self):
"""Test top-level expressions."""
@@ -38,23 +39,43 @@ class TopLevelExpressionsTestCase(TestBa
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=False)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=False)
self.runCmd("run", RUN_SUCCEEDED)
def run_dummy(self):
self.runCmd("file dummy", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "dummy.cpp", self.dummy_line, num_expected_locations=1, loc_exact=False)
+ lldbutil.run_break_set_by_file_and_line(
+ self,
+ "dummy.cpp",
+ self.dummy_line,
+ num_expected_locations=1,
+ loc_exact=False)
self.runCmd("run", RUN_SUCCEEDED)
@add_test_categories(['pyapi'])
@expectedFailureAndroid(api_levels=[21, 22], bugnumber="llvm.org/pr27787")
- @expectedFailureAll(oslist=["linux"], archs=["arm", "aarch64"], bugnumber="llvm.org/pr27787")
- @expectedFailureAll(bugnumber="llvm.org/pr28353", oslist=["linux"], archs=["i386", "x86_64"], compiler="gcc", compiler_version=["<", "4.9"])
- @skipIf(debug_info="gmodules") # not relevant
- @skipIf(oslist=["windows"]) # Error in record layout on Windows
+ @expectedFailureAll(
+ oslist=["linux"],
+ archs=[
+ "arm",
+ "aarch64"],
+ bugnumber="llvm.org/pr27787")
+ @expectedFailureAll(
+ bugnumber="llvm.org/pr28353",
+ oslist=["linux"],
+ archs=[
+ "i386",
+ "x86_64"],
+ compiler="gcc",
+ compiler_version=[
+ "<",
+ "4.9"])
+ @skipIf(debug_info="gmodules") # not relevant
+ @skipIf(oslist=["windows"]) # Error in record layout on Windows
def test_top_level_expressions(self):
self.build_and_run()
@@ -86,4 +107,6 @@ class TopLevelExpressionsTestCase(TestBa
resultFromTopLevel = self.frame().EvaluateExpression("doTest()")
self.assertTrue(resultFromTopLevel.IsValid())
- self.assertEqual(resultFromCode, resultFromTopLevel.GetValueAsUnsigned())
+ self.assertEqual(
+ resultFromCode,
+ resultFromTopLevel.GetValueAsUnsigned())
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py Tue Sep 6 15:57:50 2016
@@ -7,12 +7,12 @@ The expression parser's type search only
from __future__ import print_function
-
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class ObjCTypeQueryTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,8 +21,8 @@ class ObjCTypeQueryTestCase(TestBase):
# Call super's setUp().
TestBase.setUp(self)
# Find the line number to break for main.m.
- self.line = line_number('main.m',
- "// Set breakpoint here, then do 'expr (NSArray*)array_token'.")
+ self.line = line_number(
+ 'main.m', "// Set breakpoint here, then do 'expr (NSArray*)array_token'.")
@skipUnlessDarwin
def test(self):
@@ -30,11 +30,12 @@ class ObjCTypeQueryTestCase(TestBase):
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# Now do a NSArry type query from the 'main.m' compile uint.
self.expect("expression (NSArray*)array_token",
- substrs = ['(NSArray *) $0 = 0x'])
+ substrs=['(NSArray *) $0 = 0x'])
# (NSArray *) $0 = 0x00007fff70118398
Modified: lldb/trunk/packages/Python/lldbsuite/test/expression_command/unwind_expression/TestUnwindExpression.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/unwind_expression/TestUnwindExpression.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/expression_command/unwind_expression/TestUnwindExpression.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/expression_command/unwind_expression/TestUnwindExpression.py Tue Sep 6 15:57:50 2016
@@ -5,15 +5,16 @@ Test stopping at a breakpoint in an expr
from __future__ import print_function
-
import unittest2
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class UnwindFromExpressionTest(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,7 +24,6 @@ class UnwindFromExpressionTest(TestBase)
TestBase.setUp(self)
@add_test_categories(['pyapi'])
-
def test_unwind_expression(self):
"""Test unwinding from an expression."""
self.build()
@@ -35,11 +35,13 @@ class UnwindFromExpressionTest(TestBase)
# Create the breakpoint.
main_spec = lldb.SBFileSpec("main.cpp", False)
- breakpoint = target.BreakpointCreateBySourceRegex("// Set a breakpoint here to get started", main_spec)
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ "// Set a breakpoint here to get started", main_spec)
self.assertTrue(breakpoint, VALID_BREAKPOINT)
# Launch the process, and do not stop at the entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
if not process:
self.fail("SBTarget.LaunchProcess() failed")
@@ -49,17 +51,20 @@ class UnwindFromExpressionTest(TestBase)
"instead the actual state is: '%s'" %
lldbutil.state_type_to_str(process.GetState()))
- thread = lldbutil.get_one_thread_stopped_at_breakpoint(process, breakpoint)
- self.assertIsNotNone(thread, "Expected one thread to be stopped at the breakpoint")
+ thread = lldbutil.get_one_thread_stopped_at_breakpoint(
+ process, breakpoint)
+ self.assertIsNotNone(
+ thread, "Expected one thread to be stopped at the breakpoint")
#
# Use Python API to evaluate expressions while stopped in a stack frame.
#
main_frame = thread.GetFrameAtIndex(0)
- # Next set a breakpoint in this function, set up Expression options to stop on
+ # Next set a breakpoint in this function, set up Expression options to stop on
# breakpoint hits, and call the function.
- fun_bkpt = target.BreakpointCreateBySourceRegex("// Stop inside the function here.", main_spec)
+ fun_bkpt = target.BreakpointCreateBySourceRegex(
+ "// Stop inside the function here.", main_spec)
self.assertTrue(fun_bkpt, VALID_BREAKPOINT)
options = lldb.SBExpressionOptions()
options.SetIgnoreBreakpoints(False)
@@ -67,17 +72,26 @@ class UnwindFromExpressionTest(TestBase)
val = main_frame.EvaluateExpression("a_function_to_call()", options)
- self.assertTrue(val.GetError().Fail(), "We did not complete the execution.")
+ self.assertTrue(
+ val.GetError().Fail(),
+ "We did not complete the execution.")
error_str = val.GetError().GetCString()
- self.assertTrue("Execution was interrupted, reason: breakpoint" in error_str, "And the reason was right.")
+ self.assertTrue(
+ "Execution was interrupted, reason: breakpoint" in error_str,
+ "And the reason was right.")
+
+ thread = lldbutil.get_one_thread_stopped_at_breakpoint(
+ process, fun_bkpt)
+ self.assertTrue(
+ thread.IsValid(),
+ "We are indeed stopped at our breakpoint")
- thread = lldbutil.get_one_thread_stopped_at_breakpoint(process, fun_bkpt)
- self.assertTrue(thread.IsValid(), "We are indeed stopped at our breakpoint")
-
- # Now unwind the expression, and make sure we got back to where we started.
+ # Now unwind the expression, and make sure we got back to where we
+ # started.
error = thread.UnwindInnermostExpression()
self.assertTrue(error.Success(), "We succeeded in unwinding")
-
- cur_frame = thread.GetFrameAtIndex(0)
- self.assertTrue(cur_frame.IsEqual(main_frame), "We got back to the main frame.")
+ cur_frame = thread.GetFrameAtIndex(0)
+ self.assertTrue(
+ cur_frame.IsEqual(main_frame),
+ "We got back to the main frame.")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py Tue Sep 6 15:57:50 2016
@@ -5,19 +5,20 @@ Test some lldb command abbreviations and
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class AbbreviationsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@no_debug_info_test
- def test_command_abbreviations_and_aliases (self):
+ def test_command_abbreviations_and_aliases(self):
command_interpreter = self.dbg.GetCommandInterpreter()
self.assertTrue(command_interpreter, VALID_COMMAND_INTERPRETER)
result = lldb.SBCommandReturnObject()
@@ -47,9 +48,12 @@ class AbbreviationsTestCase(TestBase):
self.assertTrue(result.GetError().startswith("Ambiguous command"))
# Make sure an unabbreviated command is not mangled.
- command_interpreter.ResolveCommand("breakpoint set --name main --line 123", result)
+ command_interpreter.ResolveCommand(
+ "breakpoint set --name main --line 123", result)
self.assertTrue(result.Succeeded())
- self.assertEqual("breakpoint set --name main --line 123", result.GetOutput())
+ self.assertEqual(
+ "breakpoint set --name main --line 123",
+ result.GetOutput())
# Create some aliases.
self.runCmd("com a alias com al")
@@ -69,33 +73,40 @@ class AbbreviationsTestCase(TestBase):
self.runCmd("alias pltty process launch -s -o %1 -e %1")
command_interpreter.ResolveCommand("pltty /dev/tty0", result)
self.assertTrue(result.Succeeded())
- self.assertEqual("process launch -s -o /dev/tty0 -e /dev/tty0", result.GetOutput())
+ self.assertEqual(
+ "process launch -s -o /dev/tty0 -e /dev/tty0",
+ result.GetOutput())
self.runCmd("alias xyzzy breakpoint set -n %1 -l %2")
command_interpreter.ResolveCommand("xyzzy main 123", result)
self.assertTrue(result.Succeeded())
- self.assertEqual("breakpoint set -n main -l 123", result.GetOutput().strip())
+ self.assertEqual(
+ "breakpoint set -n main -l 123",
+ result.GetOutput().strip())
# And again, without enough parameters.
command_interpreter.ResolveCommand("xyzzy main", result)
self.assertFalse(result.Succeeded())
# Check a command that wants the raw input.
- command_interpreter.ResolveCommand(r'''sc print("\n\n\tHello!\n")''', result)
+ command_interpreter.ResolveCommand(
+ r'''sc print("\n\n\tHello!\n")''', result)
self.assertTrue(result.Succeeded())
- self.assertEqual(r'''script print("\n\n\tHello!\n")''', result.GetOutput())
+ self.assertEqual(
+ r'''script print("\n\n\tHello!\n")''',
+ result.GetOutput())
# Prompt changing stuff should be tested, but this doesn't seem like the
# right test to do it in. It has nothing to do with aliases or abbreviations.
#self.runCmd("com sou ./change_prompt.lldb")
- #self.expect("settings show prompt",
+ # self.expect("settings show prompt",
# startstr = 'prompt (string) = "[with-three-trailing-spaces] "')
#self.runCmd("settings clear prompt")
- #self.expect("settings show prompt",
+ # self.expect("settings show prompt",
# startstr = 'prompt (string) = "(lldb) "')
#self.runCmd("se se prompt 'Sycamore> '")
- #self.expect("se sh prompt",
+ # self.expect("se sh prompt",
# startstr = 'prompt (string) = "Sycamore> "')
#self.runCmd("se cl prompt")
- #self.expect("set sh prompt",
+ # self.expect("set sh prompt",
# startstr = 'prompt (string) = "(lldb) "')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py Tue Sep 6 15:57:50 2016
@@ -6,19 +6,20 @@ many commands remain available even afte
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class CommonShortSpellingsTestCase(TestBase):
-
+
mydir = TestBase.compute_mydir(__file__)
@no_debug_info_test
- def test_abbrevs2 (self):
+ def test_abbrevs2(self):
command_interpreter = self.dbg.GetCommandInterpreter()
self.assertTrue(command_interpreter, VALID_COMMAND_INTERPRETER)
result = lldb.SBCommandReturnObject()
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test that apropos env doesn't crash tryi
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class AproposWithProcessTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,16 +30,17 @@ class AproposWithProcessTestCase(TestBas
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break in main() aftre the variables are assigned values.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
self.runCmd('apropos env')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py Tue Sep 6 15:57:50 2016
@@ -3,13 +3,14 @@
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class BSDArchivesTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -18,10 +19,18 @@ class BSDArchivesTestCase(TestBase):
# Call super's setUp().
TestBase.setUp(self)
# Find the line number in a(int) to break at.
- self.line = line_number('a.c', '// Set file and line breakpoint inside a().')
+ self.line = line_number(
+ 'a.c', '// Set file and line breakpoint inside a().')
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24527. Makefile.rules doesn't know how to build static libs on Windows")
- @expectedFailureAll(oslist=["linux"], archs=["arm", "aarch64"], bugnumber="llvm.org/pr27795")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24527. Makefile.rules doesn't know how to build static libs on Windows")
+ @expectedFailureAll(
+ oslist=["linux"],
+ archs=[
+ "arm",
+ "aarch64"],
+ bugnumber="llvm.org/pr27795")
def test(self):
"""Break inside a() and b() defined within libfoo.a."""
self.build()
@@ -30,30 +39,32 @@ class BSDArchivesTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break inside a() by file and line first.
- lldbutil.run_break_set_by_file_and_line (self, "a.c", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "a.c", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
# Break at a(int) first.
self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
- substrs = ['(int) arg = 1'])
+ substrs=['(int) arg = 1'])
self.expect("frame variable __a_global", VARIABLES_DISPLAYED_CORRECTLY,
- substrs = ['(int) __a_global = 1'])
+ substrs=['(int) __a_global = 1'])
# Set breakpoint for b() next.
- lldbutil.run_break_set_by_symbol (self, "b", num_expected_locations=1, sym_exact=True)
+ lldbutil.run_break_set_by_symbol(
+ self, "b", num_expected_locations=1, sym_exact=True)
# Continue the program, we should break at b(int) next.
self.runCmd("continue")
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
self.expect("frame variable", VARIABLES_DISPLAYED_CORRECTLY,
- substrs = ['(int) arg = 2'])
+ substrs=['(int) arg = 2'])
self.expect("frame variable __b_global", VARIABLES_DISPLAYED_CORRECTLY,
- substrs = ['(int) __b_global = 2'])
+ substrs=['(int) __b_global = 2'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py Tue Sep 6 15:57:50 2016
@@ -5,25 +5,28 @@ Test that ASan memory history provider r
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbplatform
from lldbsuite.test import lldbutil
+
class AsanTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=["linux"], bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
- @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
+ @expectedFailureAll(
+ oslist=["linux"],
+ bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
+ @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
@skipIfRemote
@skipUnlessCompilerRt
- def test (self):
- self.build ()
- self.asan_tests ()
+ def test(self):
+ self.build()
+ self.asan_tests()
def setUp(self):
# Call super's setUp().
@@ -33,68 +36,99 @@ class AsanTestCase(TestBase):
self.line_free = line_number('main.c', '// free line')
self.line_breakpoint = line_number('main.c', '// break line')
- def asan_tests (self):
- exe = os.path.join (os.getcwd(), "a.out")
- self.expect("file " + exe, patterns = [ "Current executable set to .*a.out" ])
+ def asan_tests(self):
+ exe = os.path.join(os.getcwd(), "a.out")
+ self.expect(
+ "file " + exe,
+ patterns=["Current executable set to .*a.out"])
self.runCmd("breakpoint set -f main.c -l %d" % self.line_breakpoint)
# "memory history" command should not work without a process
self.expect("memory history 0",
- error = True,
- substrs = ["invalid process"])
+ error=True,
+ substrs=["invalid process"])
self.runCmd("run")
stop_reason = self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason()
if stop_reason == lldb.eStopReasonExec:
- # On OS X 10.10 and older, we need to re-exec to enable interceptors.
+ # On OS X 10.10 and older, we need to re-exec to enable
+ # interceptors.
self.runCmd("continue")
# the stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
# test that the ASan dylib is present
- self.expect("image lookup -n __asan_describe_address", "__asan_describe_address should be present",
- substrs = ['1 match found'])
+ self.expect(
+ "image lookup -n __asan_describe_address",
+ "__asan_describe_address should be present",
+ substrs=['1 match found'])
# test the 'memory history' command
- self.expect("memory history 'pointer'",
- substrs = [
- 'Memory allocated by Thread', 'a.out`f1', 'main.c:%d' % self.line_malloc,
- 'Memory deallocated by Thread', 'a.out`f2', 'main.c:%d' % self.line_free])
+ self.expect(
+ "memory history 'pointer'",
+ substrs=[
+ 'Memory allocated by Thread',
+ 'a.out`f1',
+ 'main.c:%d' %
+ self.line_malloc,
+ 'Memory deallocated by Thread',
+ 'a.out`f2',
+ 'main.c:%d' %
+ self.line_free])
# do the same using SB API
process = self.dbg.GetSelectedTarget().process
val = process.GetSelectedThread().GetSelectedFrame().EvaluateExpression("pointer")
addr = val.GetValueAsUnsigned()
- threads = process.GetHistoryThreads(addr);
+ threads = process.GetHistoryThreads(addr)
self.assertEqual(threads.GetSize(), 2)
-
+
history_thread = threads.GetThreadAtIndex(0)
self.assertTrue(history_thread.num_frames >= 2)
- self.assertEqual(history_thread.frames[1].GetLineEntry().GetFileSpec().GetFilename(), "main.c")
- self.assertEqual(history_thread.frames[1].GetLineEntry().GetLine(), self.line_free)
-
+ self.assertEqual(history_thread.frames[1].GetLineEntry(
+ ).GetFileSpec().GetFilename(), "main.c")
+ self.assertEqual(
+ history_thread.frames[1].GetLineEntry().GetLine(),
+ self.line_free)
+
history_thread = threads.GetThreadAtIndex(1)
self.assertTrue(history_thread.num_frames >= 2)
- self.assertEqual(history_thread.frames[1].GetLineEntry().GetFileSpec().GetFilename(), "main.c")
- self.assertEqual(history_thread.frames[1].GetLineEntry().GetLine(), self.line_malloc)
+ self.assertEqual(history_thread.frames[1].GetLineEntry(
+ ).GetFileSpec().GetFilename(), "main.c")
+ self.assertEqual(
+ history_thread.frames[1].GetLineEntry().GetLine(),
+ self.line_malloc)
- # let's free the container (SBThreadCollection) and see if the SBThreads still live
+ # let's free the container (SBThreadCollection) and see if the
+ # SBThreads still live
threads = None
self.assertTrue(history_thread.num_frames >= 2)
- self.assertEqual(history_thread.frames[1].GetLineEntry().GetFileSpec().GetFilename(), "main.c")
- self.assertEqual(history_thread.frames[1].GetLineEntry().GetLine(), self.line_malloc)
-
+ self.assertEqual(history_thread.frames[1].GetLineEntry(
+ ).GetFileSpec().GetFilename(), "main.c")
+ self.assertEqual(
+ history_thread.frames[1].GetLineEntry().GetLine(),
+ self.line_malloc)
+
# ASan will break when a report occurs and we'll try the API then
self.runCmd("continue")
- self.expect("thread list", "Process should be stopped due to ASan report",
- substrs = ['stopped', 'stop reason = Use of deallocated memory detected'])
-
- # make sure the 'memory history' command still works even when we're generating a report now
- self.expect("memory history 'another_pointer'",
- substrs = [
- 'Memory allocated by Thread', 'a.out`f1', 'main.c:%d' % self.line_malloc2])
+ self.expect(
+ "thread list",
+ "Process should be stopped due to ASan report",
+ substrs=[
+ 'stopped',
+ 'stop reason = Use of deallocated memory detected'])
+
+ # make sure the 'memory history' command still works even when we're
+ # generating a report now
+ self.expect(
+ "memory history 'another_pointer'",
+ substrs=[
+ 'Memory allocated by Thread',
+ 'a.out`f1',
+ 'main.c:%d' %
+ self.line_malloc2])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py Tue Sep 6 15:57:50 2016
@@ -5,25 +5,28 @@ Test the AddressSanitizer runtime suppor
from __future__ import print_function
-
-import os, time
+import os
+import time
import json
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class AsanTestReportDataCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=["linux"], bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
- @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
+ @expectedFailureAll(
+ oslist=["linux"],
+ bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
+ @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
@skipIfRemote
@skipUnlessCompilerRt
def test(self):
- self.build ()
- self.asan_tests ()
+ self.build()
+ self.asan_tests()
def setUp(self):
# Call super's setUp().
@@ -34,26 +37,43 @@ class AsanTestReportDataCase(TestBase):
self.line_breakpoint = line_number('main.c', '// break line')
self.line_crash = line_number('main.c', '// BOOM line')
- def asan_tests (self):
- exe = os.path.join (os.getcwd(), "a.out")
- self.expect("file " + exe, patterns = [ "Current executable set to .*a.out" ])
+ def asan_tests(self):
+ exe = os.path.join(os.getcwd(), "a.out")
+ self.expect(
+ "file " + exe,
+ patterns=["Current executable set to .*a.out"])
self.runCmd("run")
stop_reason = self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason()
if stop_reason == lldb.eStopReasonExec:
- # On OS X 10.10 and older, we need to re-exec to enable interceptors.
+ # On OS X 10.10 and older, we need to re-exec to enable
+ # interceptors.
self.runCmd("continue")
- self.expect("thread list", "Process should be stopped due to ASan report",
- substrs = ['stopped', 'stop reason = Use of deallocated memory detected'])
-
- self.assertEqual(self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason(), lldb.eStopReasonInstrumentation)
+ self.expect(
+ "thread list",
+ "Process should be stopped due to ASan report",
+ substrs=[
+ 'stopped',
+ 'stop reason = Use of deallocated memory detected'])
+
+ self.assertEqual(
+ self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason(),
+ lldb.eStopReasonInstrumentation)
self.expect("bt", "The backtrace should show the crashing line",
- substrs = ['main.c:%d' % self.line_crash])
+ substrs=['main.c:%d' % self.line_crash])
- self.expect("thread info -s", "The extended stop info should contain the ASan provided fields",
- substrs = ["access_size", "access_type", "address", "pc", "description", "heap-use-after-free"])
+ self.expect(
+ "thread info -s",
+ "The extended stop info should contain the ASan provided fields",
+ substrs=[
+ "access_size",
+ "access_type",
+ "address",
+ "pc",
+ "description",
+ "heap-use-after-free"])
output_lines = self.res.GetOutput().split('\n')
json_line = '\n'.join(output_lines[2:])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py Tue Sep 6 15:57:50 2016
@@ -5,8 +5,8 @@ Test process attach/resume.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
@@ -14,6 +14,7 @@ from lldbsuite.test import lldbutil
exe_name = "AttachResume" # Must match Makefile
+
class AttachResumeTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -41,35 +42,53 @@ class AttachResumeTestCase(TestBase):
process = self.dbg.GetSelectedTarget().GetProcess()
self.runCmd("c")
- lldbutil.expect_state_changes(self, listener, process, [lldb.eStateRunning])
+ lldbutil.expect_state_changes(
+ self, listener, process, [
+ lldb.eStateRunning])
self.runCmd("process interrupt")
- lldbutil.expect_state_changes(self, listener, process, [lldb.eStateStopped])
+ lldbutil.expect_state_changes(
+ self, listener, process, [
+ lldb.eStateStopped])
# be sure to continue/interrupt/continue (r204504)
self.runCmd("c")
- lldbutil.expect_state_changes(self, listener, process, [lldb.eStateRunning])
+ lldbutil.expect_state_changes(
+ self, listener, process, [
+ lldb.eStateRunning])
self.runCmd("process interrupt")
- lldbutil.expect_state_changes(self, listener, process, [lldb.eStateStopped])
+ lldbutil.expect_state_changes(
+ self, listener, process, [
+ lldb.eStateStopped])
# Second interrupt should have no effect.
- self.expect("process interrupt", patterns=["Process is not running"], error=True)
+ self.expect(
+ "process interrupt",
+ patterns=["Process is not running"],
+ error=True)
# check that this breakpoint is auto-cleared on detach (r204752)
- self.runCmd("br set -f main.cpp -l %u" % (line_number('main.cpp', '// Set breakpoint here')))
+ self.runCmd("br set -f main.cpp -l %u" %
+ (line_number('main.cpp', '// Set breakpoint here')))
self.runCmd("c")
- lldbutil.expect_state_changes(self, listener, process, [lldb.eStateRunning, lldb.eStateStopped])
+ lldbutil.expect_state_changes(
+ self, listener, process, [
+ lldb.eStateRunning, lldb.eStateStopped])
self.expect('br list', 'Breakpoint not hit',
- substrs = ['hit count = 1'])
+ substrs=['hit count = 1'])
# Make sure the breakpoint is not hit again.
- self.expect("expr debugger_flag = false", substrs=[" = false"]);
+ self.expect("expr debugger_flag = false", substrs=[" = false"])
self.runCmd("c")
- lldbutil.expect_state_changes(self, listener, process, [lldb.eStateRunning])
+ lldbutil.expect_state_changes(
+ self, listener, process, [
+ lldb.eStateRunning])
# make sure to detach while in running state (r204759)
self.runCmd("detach")
- lldbutil.expect_state_changes(self, listener, process, [lldb.eStateDetached])
+ lldbutil.expect_state_changes(
+ self, listener, process, [
+ lldb.eStateDetached])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py Tue Sep 6 15:57:50 2016
@@ -5,7 +5,6 @@ Test whether a process started by lldb h
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test import lldbutil
@@ -28,55 +27,79 @@ class AvoidsFdLeakTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376")
- @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr25624 still failing with Python 2.7.10")
- @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
- @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
- def test_fd_leak_basic (self):
+ @expectedFailureAll(
+ oslist=['freebsd'],
+ bugnumber="llvm.org/pr25624 still failing with Python 2.7.10")
+ # The check for descriptor leakage needs to be implemented differently
+ # here.
+ @skipIfWindows
+ @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
+ def test_fd_leak_basic(self):
self.do_test([])
@expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376")
- @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr25624 still failing with Python 2.7.10")
- @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
- @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
- def test_fd_leak_log (self):
+ @expectedFailureAll(
+ oslist=['freebsd'],
+ bugnumber="llvm.org/pr25624 still failing with Python 2.7.10")
+ # The check for descriptor leakage needs to be implemented differently
+ # here.
+ @skipIfWindows
+ @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
+ def test_fd_leak_log(self):
self.do_test(["log enable -f '/dev/null' lldb commands"])
- def do_test (self, commands):
+ def do_test(self, commands):
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
+ exe = os.path.join(os.getcwd(), "a.out")
for c in commands:
self.runCmd(c)
target = self.dbg.CreateTarget(exe)
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
- self.assertTrue(process.GetState() == lldb.eStateExited, "Process should have exited.")
- self.assertTrue(process.GetExitStatus() == 0,
- "Process returned non-zero status. Were incorrect file descriptors passed?")
+ self.assertTrue(
+ process.GetState() == lldb.eStateExited,
+ "Process should have exited.")
+ self.assertTrue(
+ process.GetExitStatus() == 0,
+ "Process returned non-zero status. Were incorrect file descriptors passed?")
@expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376")
- @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr25624 still failing with Python 2.7.10")
- @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
- @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
- def test_fd_leak_multitarget (self):
+ @expectedFailureAll(
+ oslist=['freebsd'],
+ bugnumber="llvm.org/pr25624 still failing with Python 2.7.10")
+ # The check for descriptor leakage needs to be implemented differently
+ # here.
+ @skipIfWindows
+ @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
+ def test_fd_leak_multitarget(self):
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
+ exe = os.path.join(os.getcwd(), "a.out")
target = self.dbg.CreateTarget(exe)
- breakpoint = target.BreakpointCreateBySourceRegex ('Set breakpoint here', lldb.SBFileSpec ("main.c", False))
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ 'Set breakpoint here', lldb.SBFileSpec("main.c", False))
self.assertTrue(breakpoint, VALID_BREAKPOINT)
- process1 = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process1 = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process1, PROCESS_IS_VALID)
- self.assertTrue(process1.GetState() == lldb.eStateStopped, "Process should have been stopped.")
+ self.assertTrue(
+ process1.GetState() == lldb.eStateStopped,
+ "Process should have been stopped.")
target2 = self.dbg.CreateTarget(exe)
- process2 = target2.LaunchSimple (None, None, self.get_process_working_directory())
+ process2 = target2.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process2, PROCESS_IS_VALID)
- self.assertTrue(process2.GetState() == lldb.eStateExited, "Process should have exited.")
- self.assertTrue(process2.GetExitStatus() == 0,
- "Process returned non-zero status. Were incorrect file descriptors passed?")
+ self.assertTrue(
+ process2.GetState() == lldb.eStateExited,
+ "Process should have exited.")
+ self.assertTrue(
+ process2.GetExitStatus() == 0,
+ "Process returned non-zero status. Were incorrect file descriptors passed?")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test that backticks without a target sho
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class BackticksWithNoTargetTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -20,4 +21,4 @@ class BackticksWithNoTargetTestCase(Test
def test_backticks_no_target(self):
"""A simple test of backticks without a target."""
self.expect("print `1+2-3`",
- substrs = [' = 0'])
+ substrs=[' = 0'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py Tue Sep 6 15:57:50 2016
@@ -5,18 +5,19 @@ Test address breakpoints set with shared
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
import lldbsuite.test.lldbutil as lldbutil
from lldbsuite.test.lldbtest import *
+
class AddressBreakpointTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def test_address_breakpoints (self):
+ def test_address_breakpoints(self):
"""Test address breakpoints set with shared library of SBAddress work correctly."""
self.build()
self.address_breakpoints()
@@ -34,7 +35,8 @@ class AddressBreakpointTestCase(TestBase
self.assertTrue(target, VALID_TARGET)
# Now create a breakpoint on main.c by name 'c'.
- breakpoint = target.BreakpointCreateBySourceRegex("Set a breakpoint here", lldb.SBFileSpec("main.c"))
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ "Set a breakpoint here", lldb.SBFileSpec("main.c"))
self.assertTrue(breakpoint and
breakpoint.GetNumLocations() == 1,
VALID_BREAKPOINT)
@@ -48,7 +50,7 @@ class AddressBreakpointTestCase(TestBase
# Next get the address from the location, and create an address breakpoint using
# that address:
-
+
address = location.GetAddress()
target.BreakpointDelete(breakpoint.GetID())
@@ -61,16 +63,18 @@ class AddressBreakpointTestCase(TestBase
flags = launch_info.GetLaunchFlags()
flags &= ~lldb.eLaunchFlagDisableASLR
launch_info.SetLaunchFlags(flags)
-
+
error = lldb.SBError()
- process = target.Launch (launch_info, error)
+ process = target.Launch(launch_info, error)
self.assertTrue(process, PROCESS_IS_VALID)
# Did we hit our breakpoint?
- from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
- threads = get_threads_stopped_at_breakpoint (process, breakpoint)
- self.assertTrue(len(threads) == 1, "There should be a thread stopped at our breakpoint")
+ from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
+ threads = get_threads_stopped_at_breakpoint(process, breakpoint)
+ self.assertTrue(
+ len(threads) == 1,
+ "There should be a thread stopped at our breakpoint")
# The hit count for the breakpoint should be 1.
self.assertTrue(breakpoint.GetHitCount() == 1)
@@ -82,10 +86,12 @@ class AddressBreakpointTestCase(TestBase
launch_info.SetLaunchFlags(flags)
process = target.Launch(launch_info, error)
- self.assertTrue (process, PROCESS_IS_VALID)
+ self.assertTrue(process, PROCESS_IS_VALID)
- thread = get_threads_stopped_at_breakpoint (process, breakpoint)
- self.assertTrue(len(threads) == 1, "There should be a thread stopped at our breakpoint")
+ thread = get_threads_stopped_at_breakpoint(process, breakpoint)
+ self.assertTrue(
+ len(threads) == 1,
+ "There should be a thread stopped at our breakpoint")
# The hit count for the breakpoint should now be 2.
self.assertTrue(breakpoint.GetHitCount() == 2)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py Tue Sep 6 15:57:50 2016
@@ -5,18 +5,19 @@ Test that breakpoints set on a bad addre
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
import lldbsuite.test.lldbutil as lldbutil
from lldbsuite.test.lldbtest import *
+
class BadAddressBreakpointTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def test_bad_address_breakpoints (self):
+ def test_bad_address_breakpoints(self):
"""Test that breakpoints set on a bad address say they are bad."""
self.build()
self.address_breakpoints()
@@ -34,7 +35,8 @@ class BadAddressBreakpointTestCase(TestB
self.assertTrue(target, VALID_TARGET)
# Now create a breakpoint on main.c by name 'c'.
- breakpoint = target.BreakpointCreateBySourceRegex("Set a breakpoint here", lldb.SBFileSpec("main.c"))
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ "Set a breakpoint here", lldb.SBFileSpec("main.c"))
self.assertTrue(breakpoint and
breakpoint.GetNumLocations() == 1,
VALID_BREAKPOINT)
@@ -47,16 +49,18 @@ class BadAddressBreakpointTestCase(TestB
VALID_BREAKPOINT_LOCATION)
launch_info = lldb.SBLaunchInfo(None)
-
+
error = lldb.SBError()
- process = target.Launch (launch_info, error)
+ process = target.Launch(launch_info, error)
self.assertTrue(process, PROCESS_IS_VALID)
# Did we hit our breakpoint?
- from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
- threads = get_threads_stopped_at_breakpoint (process, breakpoint)
- self.assertTrue(len(threads) == 1, "There should be a thread stopped at our breakpoint")
+ from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
+ threads = get_threads_stopped_at_breakpoint(process, breakpoint)
+ self.assertTrue(
+ len(threads) == 1,
+ "There should be a thread stopped at our breakpoint")
# The hit count for the breakpoint should be 1.
self.assertTrue(breakpoint.GetHitCount() == 1)
@@ -72,6 +76,5 @@ class BadAddressBreakpointTestCase(TestB
for bp_loc in bkpt:
self.assertTrue(bp_loc.IsResolved() == False)
else:
- self.fail("Could not find an illegal address at which to set a bad breakpoint.")
-
-
+ self.fail(
+ "Could not find an illegal address at which to set a bad breakpoint.")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_case_sensitivity/TestBreakpointCaseSensitivity.py Tue Sep 6 15:57:50 2016
@@ -9,6 +9,7 @@ from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
from lldbsuite.test import lldbplatform, lldbplatformutil
+
class BreakpointCaseSensitivityTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
BREAKPOINT_TEXT = 'Set a breakpoint here'
@@ -24,8 +25,9 @@ class BreakpointCaseSensitivityTestCase(
self.build()
self.case_sensitivity_breakpoint(True)
- @skipIf(oslist=['windows']) # Skip for windows platforms
- @expectedFailureAll() # Failing for unknown reason on non-Windows platforms.
+ @skipIf(oslist=['windows']) # Skip for windows platforms
+ # Failing for unknown reason on non-Windows platforms.
+ @expectedFailureAll()
def test_breakpoint_doesnt_match_file_with_different_case(self):
"""Set breakpoint on file, shouldn't match files with different case on POSIX systems"""
self.build()
@@ -33,19 +35,19 @@ class BreakpointCaseSensitivityTestCase(
def case_sensitivity_breakpoint(self, case_insensitive):
"""Set breakpoint on file, should match files with different case if case_insensitive is True"""
-
+
# use different case to check CreateTarget
exe = 'a.out'
if case_insensitive:
exe = exe.upper()
-
+
exe = os.path.join(os.getcwd(), exe)
# Create a target by the debugger.
self.target = self.dbg.CreateTarget(exe)
self.assertTrue(self.target, VALID_TARGET)
- cwd = self.get_process_working_directory();
-
+ cwd = self.get_process_working_directory()
+
# try both BreakpointCreateByLocation and BreakpointCreateBySourceRegex
for regex in [False, True]:
# should always hit
@@ -68,47 +70,54 @@ class BreakpointCaseSensitivityTestCase(
def check_breakpoint(self, file, source_regex, should_hit):
"""
Check breakpoint hit at given file set by given method
-
+
file:
File where insert the breakpoint
-
+
source_regex:
True for testing using BreakpointCreateBySourceRegex,
False for BreakpointCreateByLocation
-
+
should_hit:
True if the breakpoint should hit, False otherwise
"""
-
- desc = ' file %s set by %s' % (file, 'regex' if source_regex else 'location')
+
+ desc = ' file %s set by %s' % (
+ file, 'regex' if source_regex else 'location')
if source_regex:
- breakpoint = self.target.BreakpointCreateBySourceRegex(self.BREAKPOINT_TEXT,
- lldb.SBFileSpec(file))
- else:
- breakpoint = self.target.BreakpointCreateByLocation(file, self.line)
-
+ breakpoint = self.target.BreakpointCreateBySourceRegex(
+ self.BREAKPOINT_TEXT, lldb.SBFileSpec(file))
+ else:
+ breakpoint = self.target.BreakpointCreateByLocation(
+ file, self.line)
+
self.assertEqual(breakpoint and breakpoint.GetNumLocations() == 1,
- should_hit,
- VALID_BREAKPOINT + desc)
+ should_hit,
+ VALID_BREAKPOINT + desc)
# Get the breakpoint location from breakpoint after we verified that,
# indeed, it has one location.
location = breakpoint.GetLocationAtIndex(0)
self.assertEqual(location and location.IsEnabled(),
- should_hit,
- VALID_BREAKPOINT_LOCATION + desc)
-
- process = self.target.LaunchSimple(None, None, self.get_process_working_directory())
+ should_hit,
+ VALID_BREAKPOINT_LOCATION + desc)
+
+ process = self.target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID + desc)
if should_hit:
# Did we hit our breakpoint?
- from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
- threads = get_threads_stopped_at_breakpoint (process, breakpoint)
- self.assertEqual(len(threads), 1, "There should be a thread stopped at breakpoint" + desc)
+ from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
+ threads = get_threads_stopped_at_breakpoint(process, breakpoint)
+ self.assertEqual(
+ len(threads),
+ 1,
+ "There should be a thread stopped at breakpoint" +
+ desc)
# The hit count for the breakpoint should be 1.
self.assertEqual(breakpoint.GetHitCount(), 1)
-
+
else:
# check the breakpoint was not hit
self.assertEqual(lldb.eStateExited, process.GetState())
@@ -116,6 +125,6 @@ class BreakpointCaseSensitivityTestCase(
# let process finish
process.Continue()
-
+
# cleanup
self.target.BreakpointDelete(breakpoint.GetID())
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb breakpoint command add/list/de
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class BreakpointCommandTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -27,7 +28,7 @@ class BreakpointCommandTestCase(TestBase
"""Test a sequence of breakpoint command add, list, and delete."""
self.build()
self.breakpoint_command_sequence()
- self.breakpoint_command_script_parameters ()
+ self.breakpoint_command_script_parameters()
def setUp(self):
# Call super's setUp().
@@ -36,7 +37,8 @@ class BreakpointCommandTestCase(TestBase
self.line = line_number('main.c', '// Set break point at this line.')
# disable "There is a running process, kill it and restart?" prompt
self.runCmd("settings set auto-confirm true")
- self.addTearDownHook(lambda: self.runCmd("settings clear auto-confirm"))
+ self.addTearDownHook(
+ lambda: self.runCmd("settings clear auto-confirm"))
def breakpoint_command_sequence(self):
"""Test a sequence of breakpoint command add, list, and delete."""
@@ -45,45 +47,64 @@ class BreakpointCommandTestCase(TestBase
# Add three breakpoints on the same line. The first time we don't specify the file,
# since the default file is the one containing main:
- lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1, loc_exact=True)
- lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
- lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
- # Breakpoint 4 - set at the same location as breakpoint 1 to test setting breakpoint commands on two breakpoints at a time
- lldbutil.run_break_set_by_file_and_line (self, None, self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, None, self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
+ # Breakpoint 4 - set at the same location as breakpoint 1 to test
+ # setting breakpoint commands on two breakpoints at a time
+ lldbutil.run_break_set_by_file_and_line(
+ self, None, self.line, num_expected_locations=1, loc_exact=True)
# Now add callbacks for the breakpoints just created.
- self.runCmd("breakpoint command add -s command -o 'frame variable --show-types --scope' 1 4")
- self.runCmd("breakpoint command add -s python -o 'here = open(\"output.txt\", \"w\"); here.write(\"lldb\\n\"); here.close()' 2")
- self.runCmd("breakpoint command add --python-function bktptcmd.function 3")
+ self.runCmd(
+ "breakpoint command add -s command -o 'frame variable --show-types --scope' 1 4")
+ self.runCmd(
+ "breakpoint command add -s python -o 'here = open(\"output.txt\", \"w\"); here.write(\"lldb\\n\"); here.close()' 2")
+ self.runCmd(
+ "breakpoint command add --python-function bktptcmd.function 3")
# Check that the breakpoint commands are correctly set.
# The breakpoint list now only contains breakpoint 1.
- self.expect("breakpoint list", "Breakpoints 1 & 2 created",
- substrs = ["2: file = 'main.c', line = %d, exact_match = 0, locations = 1" % self.line],
- patterns = ["1: file = '.*main.c', line = %d, exact_match = 0, locations = 1" % self.line] )
-
- self.expect("breakpoint list -f", "Breakpoints 1 & 2 created",
- substrs = ["2: file = 'main.c', line = %d, exact_match = 0, locations = 1" % self.line],
- patterns = ["1: file = '.*main.c', line = %d, exact_match = 0, locations = 1" % self.line,
- "1.1: .+at main.c:%d, .+unresolved, hit count = 0" % self.line,
- "2.1: .+at main.c:%d, .+unresolved, hit count = 0" % self.line])
+ self.expect(
+ "breakpoint list", "Breakpoints 1 & 2 created", substrs=[
+ "2: file = 'main.c', line = %d, exact_match = 0, locations = 1" %
+ self.line], patterns=[
+ "1: file = '.*main.c', line = %d, exact_match = 0, locations = 1" %
+ self.line])
+
+ self.expect(
+ "breakpoint list -f",
+ "Breakpoints 1 & 2 created",
+ substrs=[
+ "2: file = 'main.c', line = %d, exact_match = 0, locations = 1" %
+ self.line],
+ patterns=[
+ "1: file = '.*main.c', line = %d, exact_match = 0, locations = 1" %
+ self.line,
+ "1.1: .+at main.c:%d, .+unresolved, hit count = 0" %
+ self.line,
+ "2.1: .+at main.c:%d, .+unresolved, hit count = 0" %
+ self.line])
self.expect("breakpoint command list 1", "Breakpoint 1 command ok",
- substrs = ["Breakpoint commands:",
- "frame variable --show-types --scope"])
+ substrs=["Breakpoint commands:",
+ "frame variable --show-types --scope"])
self.expect("breakpoint command list 2", "Breakpoint 2 command ok",
- substrs = ["Breakpoint commands:",
- "here = open",
- "here.write",
- "here.close()"])
+ substrs=["Breakpoint commands:",
+ "here = open",
+ "here.write",
+ "here.close()"])
self.expect("breakpoint command list 3", "Breakpoint 3 command ok",
- substrs = ["Breakpoint commands:",
- "bktptcmd.function(frame, bp_loc, internal_dict)"])
+ substrs=["Breakpoint commands:",
+ "bktptcmd.function(frame, bp_loc, internal_dict)"])
self.expect("breakpoint command list 4", "Breakpoint 4 command ok",
- substrs = ["Breakpoint commands:",
- "frame variable --show-types --scope"])
+ substrs=["Breakpoint commands:",
+ "frame variable --show-types --scope"])
self.runCmd("breakpoint delete 4")
@@ -93,43 +114,68 @@ class BreakpointCommandTestCase(TestBase
# and then specify only one file. The first time we should get two locations,
# the second time only one:
- lldbutil.run_break_set_by_regexp (self, r"._MyFunction", num_expected_locations=2)
-
- lldbutil.run_break_set_by_regexp (self, r"._MyFunction", extra_options="-f a.c", num_expected_locations=1)
-
- lldbutil.run_break_set_by_regexp (self, r"._MyFunction", extra_options="-f a.c -f b.c", num_expected_locations=2)
+ lldbutil.run_break_set_by_regexp(
+ self, r"._MyFunction", num_expected_locations=2)
+
+ lldbutil.run_break_set_by_regexp(
+ self,
+ r"._MyFunction",
+ extra_options="-f a.c",
+ num_expected_locations=1)
+
+ lldbutil.run_break_set_by_regexp(
+ self,
+ r"._MyFunction",
+ extra_options="-f a.c -f b.c",
+ num_expected_locations=2)
# Now try a source regex breakpoint:
- lldbutil.run_break_set_by_source_regexp (self, r"is about to return [12]0", extra_options="-f a.c -f b.c", num_expected_locations=2)
-
- lldbutil.run_break_set_by_source_regexp (self, r"is about to return [12]0", extra_options="-f a.c", num_expected_locations=1)
-
+ lldbutil.run_break_set_by_source_regexp(
+ self,
+ r"is about to return [12]0",
+ extra_options="-f a.c -f b.c",
+ num_expected_locations=2)
+
+ lldbutil.run_break_set_by_source_regexp(
+ self,
+ r"is about to return [12]0",
+ extra_options="-f a.c",
+ num_expected_locations=1)
+
# Run the program. Remove 'output.txt' if it exists.
self.RemoveTempFile("output.txt")
self.RemoveTempFile("output2.txt")
self.runCmd("run", RUN_SUCCEEDED)
- # Check that the file 'output.txt' exists and contains the string "lldb".
+ # Check that the file 'output.txt' exists and contains the string
+ # "lldb".
# The 'output.txt' file should now exist.
- self.assertTrue(os.path.isfile("output.txt"),
- "'output.txt' exists due to breakpoint command for breakpoint 2.")
- self.assertTrue(os.path.isfile("output2.txt"),
- "'output2.txt' exists due to breakpoint command for breakpoint 3.")
+ self.assertTrue(
+ os.path.isfile("output.txt"),
+ "'output.txt' exists due to breakpoint command for breakpoint 2.")
+ self.assertTrue(
+ os.path.isfile("output2.txt"),
+ "'output2.txt' exists due to breakpoint command for breakpoint 3.")
# Read the output file produced by running the program.
with open('output.txt', 'r') as f:
output = f.read()
- self.expect(output, "File 'output.txt' and the content matches", exe=False,
- startstr = "lldb")
+ self.expect(
+ output,
+ "File 'output.txt' and the content matches",
+ exe=False,
+ startstr="lldb")
with open('output2.txt', 'r') as f:
output = f.read()
- self.expect(output, "File 'output2.txt' and the content matches", exe=False,
- startstr = "lldb")
-
+ self.expect(
+ output,
+ "File 'output2.txt' and the content matches",
+ exe=False,
+ startstr="lldb")
# Finish the program.
self.runCmd("process continue")
@@ -140,21 +186,31 @@ class BreakpointCommandTestCase(TestBase
# Remove breakpoint 2.
self.runCmd("breakpoint delete 2")
- self.expect("breakpoint command list 1",
- startstr = "Breakpoint 1 does not have an associated command.")
- self.expect("breakpoint command list 2", error=True,
- startstr = "error: '2' is not a currently valid breakpoint ID.")
+ self.expect(
+ "breakpoint command list 1",
+ startstr="Breakpoint 1 does not have an associated command.")
+ self.expect(
+ "breakpoint command list 2",
+ error=True,
+ startstr="error: '2' is not a currently valid breakpoint ID.")
# The breakpoint list now only contains breakpoint 1.
- self.expect("breakpoint list -f", "Breakpoint 1 exists",
- patterns = ["1: file = '.*main.c', line = %d, exact_match = 0, locations = 1, resolved = 1" %
- self.line,
- "hit count = 1"])
+ self.expect(
+ "breakpoint list -f",
+ "Breakpoint 1 exists",
+ patterns=[
+ "1: file = '.*main.c', line = %d, exact_match = 0, locations = 1, resolved = 1" %
+ self.line,
+ "hit count = 1"])
# Not breakpoint 2.
- self.expect("breakpoint list -f", "No more breakpoint 2", matching=False,
- substrs = ["2: file = 'main.c', line = %d, exact_match = 0, locations = 1, resolved = 1" %
- self.line])
+ self.expect(
+ "breakpoint list -f",
+ "No more breakpoint 2",
+ matching=False,
+ substrs=[
+ "2: file = 'main.c', line = %d, exact_match = 0, locations = 1, resolved = 1" %
+ self.line])
# Run the program again, with breakpoint 1 remaining.
self.runCmd("run", RUN_SUCCEEDED)
@@ -163,20 +219,21 @@ class BreakpointCommandTestCase(TestBase
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 2.
self.expect("breakpoint list -f", BREAKPOINT_HIT_TWICE,
- substrs = ['resolved, hit count = 2'])
+ substrs=['resolved, hit count = 2'])
- def breakpoint_command_script_parameters (self):
+ def breakpoint_command_script_parameters(self):
"""Test that the frame and breakpoint location are being properly passed to the script breakpoint command function."""
exe = os.path.join(os.getcwd(), "a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Add a breakpoint.
- lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", self.line, num_expected_locations=1, loc_exact=True)
# Now add callbacks for the breakpoints just created.
self.runCmd("breakpoint command add -s python -o 'here = open(\"output-2.txt\", \"w\"); here.write(str(frame) + \"\\n\"); here.write(str(bp_loc) + \"\\n\"); here.close()' 1")
@@ -184,24 +241,30 @@ class BreakpointCommandTestCase(TestBase
# Remove 'output-2.txt' if it already exists.
if (os.path.exists('output-2.txt')):
- os.remove ('output-2.txt')
+ os.remove('output-2.txt')
- # Run program, hit breakpoint, and hopefully write out new version of 'output-2.txt'
- self.runCmd ("run", RUN_SUCCEEDED)
+ # Run program, hit breakpoint, and hopefully write out new version of
+ # 'output-2.txt'
+ self.runCmd("run", RUN_SUCCEEDED)
- # Check that the file 'output.txt' exists and contains the string "lldb".
+ # Check that the file 'output.txt' exists and contains the string
+ # "lldb".
# The 'output-2.txt' file should now exist.
- self.assertTrue(os.path.isfile("output-2.txt"),
- "'output-2.txt' exists due to breakpoint command for breakpoint 1.")
+ self.assertTrue(
+ os.path.isfile("output-2.txt"),
+ "'output-2.txt' exists due to breakpoint command for breakpoint 1.")
# Read the output file produced by running the program.
with open('output-2.txt', 'r') as f:
output = f.read()
- self.expect (output, "File 'output-2.txt' and the content matches", exe=False,
- startstr = "frame #0:",
- patterns = ["1.* where = .*main .* resolved, hit count = 1" ])
+ self.expect(
+ output,
+ "File 'output-2.txt' and the content matches",
+ exe=False,
+ startstr="frame #0:",
+ patterns=["1.* where = .*main .* resolved, hit count = 1"])
# Now remove 'output-2.txt'
- os.remove ('output-2.txt')
+ os.remove('output-2.txt')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py Tue Sep 6 15:57:50 2016
@@ -5,7 +5,6 @@ Test that you can set breakpoint command
from __future__ import print_function
-
import os
import re
import sys
@@ -14,6 +13,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PythonBreakpointCommandSettingTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,36 +23,42 @@ class PythonBreakpointCommandSettingTest
def test_step_out_python(self):
"""Test stepping out using avoid-no-debug with dsyms."""
self.build()
- self.do_set_python_command_from_python ()
+ self.do_set_python_command_from_python()
- def setUp (self):
+ def setUp(self):
TestBase.setUp(self)
self.main_source = "main.c"
self.main_source_spec = lldb.SBFileSpec(self.main_source)
-
- def do_set_python_command_from_python (self):
+ def do_set_python_command_from_python(self):
exe = os.path.join(os.getcwd(), "a.out")
error = lldb.SBError()
self.target = self.dbg.CreateTarget(exe)
self.assertTrue(self.target, VALID_TARGET)
- body_bkpt = self.target.BreakpointCreateBySourceRegex("Set break point at this line.", self.main_source_spec)
+ body_bkpt = self.target.BreakpointCreateBySourceRegex(
+ "Set break point at this line.", self.main_source_spec)
self.assertTrue(body_bkpt, VALID_BREAKPOINT)
- func_bkpt = self.target.BreakpointCreateBySourceRegex("Set break point at this line.", self.main_source_spec)
+ func_bkpt = self.target.BreakpointCreateBySourceRegex(
+ "Set break point at this line.", self.main_source_spec)
self.assertTrue(func_bkpt, VALID_BREAKPOINT)
- # Also test that setting a source regex breakpoint with an empty file spec list sets it on all files:
- no_files_bkpt = self.target.BreakpointCreateBySourceRegex("Set a breakpoint here", lldb.SBFileSpecList(), lldb.SBFileSpecList())
+ # Also test that setting a source regex breakpoint with an empty file
+ # spec list sets it on all files:
+ no_files_bkpt = self.target.BreakpointCreateBySourceRegex(
+ "Set a breakpoint here", lldb.SBFileSpecList(), lldb.SBFileSpecList())
self.assertTrue(no_files_bkpt, VALID_BREAKPOINT)
num_locations = no_files_bkpt.GetNumLocations()
- self.assertTrue(num_locations >= 2, "Got at least two breakpoint locations")
+ self.assertTrue(
+ num_locations >= 2,
+ "Got at least two breakpoint locations")
got_one_in_A = False
got_one_in_B = False
for idx in range(0, num_locations):
- comp_unit = no_files_bkpt.GetLocationAtIndex(idx).GetAddress().GetSymbolContext(lldb.eSymbolContextCompUnit).GetCompileUnit().GetFileSpec()
+ comp_unit = no_files_bkpt.GetLocationAtIndex(idx).GetAddress().GetSymbolContext(
+ lldb.eSymbolContextCompUnit).GetCompileUnit().GetFileSpec()
print("Got comp unit: ", comp_unit.GetFilename())
if comp_unit.GetFilename() == "a.c":
got_one_in_A = True
@@ -69,28 +75,36 @@ class PythonBreakpointCommandSettingTest
import TestBreakpointCommandsFromPython\n\
TestBreakpointCommandsFromPython.PythonBreakpointCommandSettingTestCase.my_var = 20\n\
print('Hit breakpoint')")
- self.assertTrue (error.Success(), "Failed to set the script callback body: %s."%(error.GetCString()))
+ self.assertTrue(
+ error.Success(),
+ "Failed to set the script callback body: %s." %
+ (error.GetCString()))
- self.dbg.HandleCommand("command script import --allow-reload ./bktptcmd.py")
+ self.dbg.HandleCommand(
+ "command script import --allow-reload ./bktptcmd.py")
func_bkpt.SetScriptCallbackFunction("bktptcmd.function")
- # We will use the function that touches a text file, so remove it first:
+ # We will use the function that touches a text file, so remove it
+ # first:
self.RemoveTempFile("output2.txt")
# Now launch the process, and do not stop at entry point.
- self.process = self.target.LaunchSimple (None, None, self.get_process_working_directory())
+ self.process = self.target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(self.process, PROCESS_IS_VALID)
# Now finish, and make sure the return value is correct.
- threads = lldbutil.get_threads_stopped_at_breakpoint (self.process, body_bkpt)
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ self.process, body_bkpt)
self.assertTrue(len(threads) == 1, "Stopped at inner breakpoint.")
self.thread = threads[0]
-
+
self.assertTrue(PythonBreakpointCommandSettingTestCase.my_var == 20)
# Check for the function version as well, which produced this file:
# Remember to clean up after ourselves...
- self.assertTrue(os.path.isfile("output2.txt"),
- "'output2.txt' exists due to breakpoint command for breakpoint function.")
+ self.assertTrue(
+ os.path.isfile("output2.txt"),
+ "'output2.txt' exists due to breakpoint command for breakpoint function.")
self.RemoveTempFile("output2.txt")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test _regexp-break command which uses re
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class RegexpBreakCommandTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -25,27 +26,47 @@ class RegexpBreakCommandTestCase(TestBas
TestBase.setUp(self)
# Find the line number to break inside main().
self.source = 'main.c'
- self.line = line_number(self.source, '// Set break point at this line.')
+ self.line = line_number(
+ self.source, '// Set break point at this line.')
def regexp_break_command(self):
"""Test the super consie "b" command, which is analias for _regexp-break."""
exe = os.path.join(os.getcwd(), "a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
- break_results = lldbutil.run_break_set_command (self, "b %d" % self.line)
- lldbutil.check_breakpoint_result (self, break_results, file_name='main.c', line_number=self.line, num_locations=1)
-
- break_results = lldbutil.run_break_set_command (self, "b %s:%d" % (self.source, self.line))
- lldbutil.check_breakpoint_result (self, break_results, file_name='main.c', line_number=self.line, num_locations=1)
+ break_results = lldbutil.run_break_set_command(
+ self, "b %d" %
+ self.line)
+ lldbutil.check_breakpoint_result(
+ self,
+ break_results,
+ file_name='main.c',
+ line_number=self.line,
+ num_locations=1)
+
+ break_results = lldbutil.run_break_set_command(
+ self, "b %s:%d" % (self.source, self.line))
+ lldbutil.check_breakpoint_result(
+ self,
+ break_results,
+ file_name='main.c',
+ line_number=self.line,
+ num_locations=1)
# Check breakpoint with full file path.
full_path = os.path.join(os.getcwd(), self.source)
- break_results = lldbutil.run_break_set_command (self, "b %s:%d" % (full_path, self.line))
- lldbutil.check_breakpoint_result (self, break_results, file_name='main.c', line_number=self.line, num_locations=1)
+ break_results = lldbutil.run_break_set_command(
+ self, "b %s:%d" % (full_path, self.line))
+ lldbutil.check_breakpoint_result(
+ self,
+ break_results,
+ file_name='main.c',
+ line_number=self.line,
+ num_locations=1)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py Tue Sep 6 15:57:50 2016
@@ -1,6 +1,7 @@
from __future__ import print_function
+
def function(frame, bp_loc, dict):
- there = open("output2.txt", "w");
- print("lldb", file=there)
- there.close()
+ there = open("output2.txt", "w")
+ print("lldb", file=there)
+ there.close()
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py Tue Sep 6 15:57:50 2016
@@ -5,38 +5,43 @@ Test breakpoint conditions with 'breakpo
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class BreakpointConditionsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ @skipIfWindows
def test_breakpoint_condition_and_run_command(self):
"""Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
self.build()
self.breakpoint_conditions()
- @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ @skipIfWindows
def test_breakpoint_condition_inline_and_run_command(self):
"""Exercise breakpoint condition inline with 'breakpoint set'."""
self.build()
self.breakpoint_conditions(inline=True)
- @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ @skipIfWindows
@add_test_categories(['pyapi'])
def test_breakpoint_condition_and_python_api(self):
"""Use Python APIs to set breakpoint conditions."""
self.build()
self.breakpoint_conditions_python()
- @skipIfWindows # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ # Requires EE to support COFF on Windows (http://llvm.org/pr22232)
+ @skipIfWindows
@add_test_categories(['pyapi'])
def test_breakpoint_invalid_condition_and_python_api(self):
"""Use Python APIs to set breakpoint conditions."""
@@ -47,8 +52,10 @@ class BreakpointConditionsTestCase(TestB
# Call super's setUp().
TestBase.setUp(self)
# Find the line number to of function 'c'.
- self.line1 = line_number('main.c', '// Find the line number of function "c" here.')
- self.line2 = line_number('main.c', "// Find the line number of c's parent call here.")
+ self.line1 = line_number(
+ 'main.c', '// Find the line number of function "c" here.')
+ self.line2 = line_number(
+ 'main.c', "// Find the line number of c's parent call here.")
def breakpoint_conditions(self, inline=False):
"""Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
@@ -57,10 +64,16 @@ class BreakpointConditionsTestCase(TestB
if inline:
# Create a breakpoint by function name 'c' and set the condition.
- lldbutil.run_break_set_by_symbol (self, "c", extra_options="-c 'val == 3'", num_expected_locations=1, sym_exact=True)
+ lldbutil.run_break_set_by_symbol(
+ self,
+ "c",
+ extra_options="-c 'val == 3'",
+ num_expected_locations=1,
+ sym_exact=True)
else:
# Create a breakpoint by function name 'c'.
- lldbutil.run_break_set_by_symbol (self, "c", num_expected_locations=1, sym_exact=True)
+ lldbutil.run_break_set_by_symbol(
+ self, "c", num_expected_locations=1, sym_exact=True)
# And set a condition on the breakpoint to stop on when 'val == 3'.
self.runCmd("breakpoint modify -c 'val == 3' 1")
@@ -70,42 +83,50 @@ class BreakpointConditionsTestCase(TestB
# The process should be stopped at this point.
self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* stopped'])
+ patterns=['Process .* stopped'])
# 'frame variable --show-types val' should return 3 due to breakpoint condition.
- self.expect("frame variable --show-types val", VARIABLES_DISPLAYED_CORRECTLY,
- startstr = '(int) val = 3')
+ self.expect(
+ "frame variable --show-types val",
+ VARIABLES_DISPLAYED_CORRECTLY,
+ startstr='(int) val = 3')
# Also check the hit count, which should be 3, by design.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = ["resolved = 1",
- "Condition: val == 3",
- "hit count = 1"])
+ substrs=["resolved = 1",
+ "Condition: val == 3",
+ "hit count = 1"])
# The frame #0 should correspond to main.c:36, the executable statement
- # in function name 'c'. And the parent frame should point to main.c:24.
+ # in function name 'c'. And the parent frame should point to
+ # main.c:24.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT_CONDITION,
- #substrs = ["stop reason = breakpoint"],
- patterns = ["frame #0.*main.c:%d" % self.line1,
- "frame #1.*main.c:%d" % self.line2])
+ #substrs = ["stop reason = breakpoint"],
+ patterns=["frame #0.*main.c:%d" % self.line1,
+ "frame #1.*main.c:%d" % self.line2])
# Test that "breakpoint modify -c ''" clears the condition for the last
# created breakpoint, so that when the breakpoint hits, val == 1.
self.runCmd("process kill")
self.runCmd("breakpoint modify -c ''")
- self.expect("breakpoint list -f", BREAKPOINT_STATE_CORRECT, matching=False,
- substrs = ["Condition:"])
+ self.expect(
+ "breakpoint list -f",
+ BREAKPOINT_STATE_CORRECT,
+ matching=False,
+ substrs=["Condition:"])
# Now run the program again.
self.runCmd("run", RUN_SUCCEEDED)
# The process should be stopped at this point.
self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* stopped'])
+ patterns=['Process .* stopped'])
# 'frame variable --show-types val' should return 1 since it is the first breakpoint hit.
- self.expect("frame variable --show-types val", VARIABLES_DISPLAYED_CORRECTLY,
- startstr = '(int) val = 1')
+ self.expect(
+ "frame variable --show-types val",
+ VARIABLES_DISPLAYED_CORRECTLY,
+ startstr='(int) val = 1')
self.runCmd("process kill")
@@ -124,7 +145,8 @@ class BreakpointConditionsTestCase(TestB
breakpoint.GetNumLocations() == 1,
VALID_BREAKPOINT)
- # We didn't associate a thread index with the breakpoint, so it should be invalid.
+ # We didn't associate a thread index with the breakpoint, so it should
+ # be invalid.
self.assertTrue(breakpoint.GetThreadIndex() == lldb.UINT32_MAX,
"The thread index should be invalid")
# The thread name should be invalid, too.
@@ -133,7 +155,8 @@ class BreakpointConditionsTestCase(TestB
# Let's set the thread index for this breakpoint and verify that it is,
# indeed, being set correctly.
- breakpoint.SetThreadIndex(1) # There's only one thread for the process.
+ # There's only one thread for the process.
+ breakpoint.SetThreadIndex(1)
self.assertTrue(breakpoint.GetThreadIndex() == 1,
"The thread index has been set correctly")
@@ -147,16 +170,19 @@ class BreakpointConditionsTestCase(TestB
# Set the condition on the breakpoint location.
location.SetCondition('val == 3')
self.expect(location.GetCondition(), exe=False,
- startstr = 'val == 3')
+ startstr='val == 3')
# Now launch the process, and do not stop at entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
# Frame #0 should be on self.line1 and the break condition should hold.
from lldbsuite.test.lldbutil import get_stopped_thread
thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
- self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint condition")
+ self.assertTrue(
+ thread.IsValid(),
+ "There should be a thread stopped due to breakpoint condition")
frame0 = thread.GetFrameAtIndex(0)
var = frame0.FindValue('val', lldb.eValueTypeVariableArgument)
self.assertTrue(frame0.GetLineEntry().GetLine() == self.line1 and
@@ -168,7 +194,8 @@ class BreakpointConditionsTestCase(TestB
# Test that the condition expression didn't create a result variable:
options = lldb.SBExpressionOptions()
value = frame0.EvaluateExpression("$0", options)
- self.assertTrue(value.GetError().Fail(), "Conditions should not make result variables.")
+ self.assertTrue(value.GetError().Fail(),
+ "Conditions should not make result variables.")
process.Continue()
def breakpoint_invalid_conditions_python(self):
@@ -189,21 +216,22 @@ class BreakpointConditionsTestCase(TestB
# Set the condition on the breakpoint.
breakpoint.SetCondition('no_such_variable == not_this_one_either')
self.expect(breakpoint.GetCondition(), exe=False,
- startstr = 'no_such_variable == not_this_one_either')
+ startstr='no_such_variable == not_this_one_either')
# Now launch the process, and do not stop at entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
# Frame #0 should be on self.line1 and the break condition should hold.
from lldbsuite.test.lldbutil import get_stopped_thread
thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
- self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint condition")
+ self.assertTrue(
+ thread.IsValid(),
+ "There should be a thread stopped due to breakpoint condition")
frame0 = thread.GetFrameAtIndex(0)
var = frame0.FindValue('val', lldb.eValueTypeVariableArgument)
self.assertTrue(frame0.GetLineEntry().GetLine() == self.line1)
# The hit count for the breakpoint should be 1.
self.assertTrue(breakpoint.GetHitCount() == 1)
-
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py Tue Sep 6 15:57:50 2016
@@ -5,47 +5,56 @@ Test lldb breakpoint ids.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class BreakpointIDTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def test (self):
+ def test(self):
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
+ exe = os.path.join(os.getcwd(), "a.out")
self.expect("file " + exe,
- patterns = [ "Current executable set to .*a.out" ])
-
-
- bpno = lldbutil.run_break_set_by_symbol (self, 'product', num_expected_locations=-1, sym_exact=False)
- self.assertTrue (bpno == 1, "First breakpoint number is 1.")
-
- bpno = lldbutil.run_break_set_by_symbol (self, 'sum', num_expected_locations=-1, sym_exact=False)
- self.assertTrue (bpno == 2, "Second breakpoint number is 2.")
-
- bpno = lldbutil.run_break_set_by_symbol (self, 'junk', num_expected_locations=0, sym_exact=False)
- self.assertTrue (bpno == 3, "Third breakpoint number is 3.")
-
- self.expect ("breakpoint disable 1.1 - 2.2 ",
- COMMAND_FAILED_AS_EXPECTED, error = True,
- startstr = "error: Invalid range: Ranges that specify particular breakpoint locations must be within the same major breakpoint; you specified two different major breakpoints, 1 and 2.")
-
- self.expect ("breakpoint disable 2 - 2.2",
- COMMAND_FAILED_AS_EXPECTED, error = True,
- startstr = "error: Invalid breakpoint id range: Either both ends of range must specify a breakpoint location, or neither can specify a breakpoint location.")
+ patterns=["Current executable set to .*a.out"])
- self.expect ("breakpoint disable 2.1 - 2",
- COMMAND_FAILED_AS_EXPECTED, error = True,
- startstr = "error: Invalid breakpoint id range: Either both ends of range must specify a breakpoint location, or neither can specify a breakpoint location.")
+ bpno = lldbutil.run_break_set_by_symbol(
+ self, 'product', num_expected_locations=-1, sym_exact=False)
+ self.assertTrue(bpno == 1, "First breakpoint number is 1.")
+
+ bpno = lldbutil.run_break_set_by_symbol(
+ self, 'sum', num_expected_locations=-1, sym_exact=False)
+ self.assertTrue(bpno == 2, "Second breakpoint number is 2.")
+
+ bpno = lldbutil.run_break_set_by_symbol(
+ self, 'junk', num_expected_locations=0, sym_exact=False)
+ self.assertTrue(bpno == 3, "Third breakpoint number is 3.")
+
+ self.expect(
+ "breakpoint disable 1.1 - 2.2 ",
+ COMMAND_FAILED_AS_EXPECTED,
+ error=True,
+ startstr="error: Invalid range: Ranges that specify particular breakpoint locations must be within the same major breakpoint; you specified two different major breakpoints, 1 and 2.")
+
+ self.expect(
+ "breakpoint disable 2 - 2.2",
+ COMMAND_FAILED_AS_EXPECTED,
+ error=True,
+ startstr="error: Invalid breakpoint id range: Either both ends of range must specify a breakpoint location, or neither can specify a breakpoint location.")
+
+ self.expect(
+ "breakpoint disable 2.1 - 2",
+ COMMAND_FAILED_AS_EXPECTED,
+ error=True,
+ startstr="error: Invalid breakpoint id range: Either both ends of range must specify a breakpoint location, or neither can specify a breakpoint location.")
- self.expect ("breakpoint disable 2.1 - 2.2",
- startstr = "2 breakpoints disabled.")
+ self.expect("breakpoint disable 2.1 - 2.2",
+ startstr="2 breakpoints disabled.")
- self.expect ("breakpoint enable 2.*",
- patterns = [ ".* breakpoints enabled."] )
+ self.expect("breakpoint enable 2.*",
+ patterns=[".* breakpoints enabled."])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test breakpoint ignore count features.
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class BreakpointIgnoreCountTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -32,11 +33,16 @@ class BreakpointIgnoreCountTestCase(Test
# Call super's setUp().
TestBase.setUp(self)
# Find the line number to of function 'c'.
- self.line1 = line_number('main.c', '// Find the line number of function "c" here.')
- self.line2 = line_number('main.c', '// b(2) -> c(2) Find the call site of b(2).')
- self.line3 = line_number('main.c', '// a(3) -> c(3) Find the call site of c(3).')
- self.line4 = line_number('main.c', '// a(3) -> c(3) Find the call site of a(3).')
- self.line5 = line_number('main.c', '// Find the call site of c in main.')
+ self.line1 = line_number(
+ 'main.c', '// Find the line number of function "c" here.')
+ self.line2 = line_number(
+ 'main.c', '// b(2) -> c(2) Find the call site of b(2).')
+ self.line3 = line_number(
+ 'main.c', '// a(3) -> c(3) Find the call site of c(3).')
+ self.line4 = line_number(
+ 'main.c', '// a(3) -> c(3) Find the call site of a(3).')
+ self.line5 = line_number(
+ 'main.c', '// Find the call site of c in main.')
def breakpoint_ignore_count(self):
"""Exercise breakpoint ignore count with 'breakpoint set -i <count>'."""
@@ -44,26 +50,33 @@ class BreakpointIgnoreCountTestCase(Test
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Create a breakpoint in main.c at line1.
- lldbutil.run_break_set_by_file_and_line (self, 'main.c', self.line1, extra_options='-i 1', num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self,
+ 'main.c',
+ self.line1,
+ extra_options='-i 1',
+ num_expected_locations=1,
+ loc_exact=True)
# Now run the program.
self.runCmd("run", RUN_SUCCEEDED)
# The process should be stopped at this point.
self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* stopped'])
+ patterns=['Process .* stopped'])
- # Also check the hit count, which should be 2, due to ignore count of 1.
+ # Also check the hit count, which should be 2, due to ignore count of
+ # 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_THRICE,
- substrs = ["resolved = 1",
- "hit count = 2"])
+ substrs=["resolved = 1",
+ "hit count = 2"])
# The frame #0 should correspond to main.c:37, the executable statement
# in function name 'c'. And frame #2 should point to main.c:45.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT_IGNORE_COUNT,
- #substrs = ["stop reason = breakpoint"],
- patterns = ["frame #0.*main.c:%d" % self.line1,
- "frame #2.*main.c:%d" % self.line2])
+ #substrs = ["stop reason = breakpoint"],
+ patterns=["frame #0.*main.c:%d" % self.line1,
+ "frame #2.*main.c:%d" % self.line2])
# continue -i 1 is the same as setting the ignore count to 1 again, try that:
# Now run the program.
@@ -71,21 +84,20 @@ class BreakpointIgnoreCountTestCase(Test
# The process should be stopped at this point.
self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* stopped'])
+ patterns=['Process .* stopped'])
- # Also check the hit count, which should be 2, due to ignore count of 1.
+ # Also check the hit count, which should be 2, due to ignore count of
+ # 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_THRICE,
- substrs = ["resolved = 1",
- "hit count = 4"])
+ substrs=["resolved = 1",
+ "hit count = 4"])
# The frame #0 should correspond to main.c:37, the executable statement
# in function name 'c'. And frame #2 should point to main.c:45.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT_IGNORE_COUNT,
- #substrs = ["stop reason = breakpoint"],
- patterns = ["frame #0.*main.c:%d" % self.line1,
- "frame #1.*main.c:%d" % self.line5])
-
-
+ #substrs = ["stop reason = breakpoint"],
+ patterns=["frame #0.*main.c:%d" % self.line1,
+ "frame #1.*main.c:%d" % self.line5])
def breakpoint_ignore_count_python(self):
"""Use Python APIs to set breakpoint ignore count."""
@@ -114,15 +126,18 @@ class BreakpointIgnoreCountTestCase(Test
"SetIgnoreCount() works correctly")
# Now launch the process, and do not stop at entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
# Frame#0 should be on main.c:37, frame#1 should be on main.c:25, and
# frame#2 should be on main.c:48.
- #lldbutil.print_stacktraces(process)
+ # lldbutil.print_stacktraces(process)
from lldbsuite.test.lldbutil import get_stopped_thread
thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
- self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint")
+ self.assertTrue(
+ thread.IsValid(),
+ "There should be a thread stopped due to breakpoint")
frame0 = thread.GetFrameAtIndex(0)
frame1 = thread.GetFrameAtIndex(1)
frame2 = thread.GetFrameAtIndex(2)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py Tue Sep 6 15:57:50 2016
@@ -1,10 +1,11 @@
"""
-Test specific to MIPS
+Test specific to MIPS
"""
from __future__ import print_function
-import os, time
+import os
+import time
import re
import unittest2
import lldb
@@ -12,6 +13,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class AvoidBreakpointInDelaySlotAPITestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,8 +23,8 @@ class AvoidBreakpointInDelaySlotAPITestC
self.build()
exe = os.path.join(os.getcwd(), "a.out")
self.expect("file " + exe,
- patterns = [ "Current executable set to .*a.out.*" ])
-
+ patterns=["Current executable set to .*a.out.*"])
+
# Create a target by the debugger.
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
@@ -33,7 +35,8 @@ class AvoidBreakpointInDelaySlotAPITestC
VALID_BREAKPOINT)
# Now launch the process, and do not stop at entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
list = target.FindFunctions('foo', lldb.eFunctionNameTypeAuto)
@@ -44,7 +47,7 @@ class AvoidBreakpointInDelaySlotAPITestC
self.assertTrue(function)
self.function(function, target)
- def function (self, function, target):
+ def function(self, function, target):
"""Iterate over instructions in function and place a breakpoint on delay slot instruction"""
# Get the list of all instructions in the function
insts = function.GetInstructions(target)
@@ -56,7 +59,7 @@ class AvoidBreakpointInDelaySlotAPITestC
branchinstaddress = inst.GetAddress().GetLoadAddress(target)
# Get next instruction i.e delay slot instruction.
- delayinst = insts.GetInstructionAtIndex(i+1)
+ delayinst = insts.GetInstructionAtIndex(i + 1)
delayinstaddr = delayinst.GetAddress().GetLoadAddress(target)
# Set breakpoint on delay slot instruction
@@ -71,9 +74,10 @@ class AvoidBreakpointInDelaySlotAPITestC
# Get the address where breakpoint is actually set.
bpaddr = location.GetLoadAddress()
-
- # Breakpoint address should be adjusted to the address of branch instruction.
- self.assertTrue(branchinstaddress == bpaddr)
+
+ # Breakpoint address should be adjusted to the address of
+ # branch instruction.
+ self.assertTrue(branchinstaddress == bpaddr)
i += 1
else:
i += 1
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py Tue Sep 6 15:57:50 2016
@@ -6,14 +6,15 @@ parser.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
import shutil
import subprocess
+
class TestBreakpointLanguage(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,7 +24,7 @@ class TestBreakpointLanguage(TestBase):
TestBase.setUp(self)
# Find the line number to break inside main().
- def check_location_file (self, bp, loc, test_name):
+ def check_location_file(self, bp, loc, test_name):
bp_loc = bp.GetLocationAtIndex(loc)
addr = bp_loc.GetAddress()
comp_unit = addr.GetCompileUnit()
@@ -37,22 +38,40 @@ class TestBreakpointLanguage(TestBase):
# Create a target by the debugger.
exe = os.path.join(os.getcwd(), "a.out")
error = lldb.SBError()
- # Don't read in dependencies so we don't come across false matches that
+ # Don't read in dependencies so we don't come across false matches that
# add unwanted breakpoint hits.
self.target = self.dbg.CreateTarget(exe, None, None, False, error)
self.assertTrue(self.target, VALID_TARGET)
- cpp_bp = self.target.BreakpointCreateByRegex("func_from", lldb.eLanguageTypeC_plus_plus, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(cpp_bp.GetNumLocations() == 1, "Only one C++ symbol matches")
+ cpp_bp = self.target.BreakpointCreateByRegex(
+ "func_from",
+ lldb.eLanguageTypeC_plus_plus,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ cpp_bp.GetNumLocations() == 1,
+ "Only one C++ symbol matches")
self.assertTrue(self.check_location_file(cpp_bp, 0, "b.cpp"))
- c_bp = self.target.BreakpointCreateByRegex("func_from", lldb.eLanguageTypeC, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(c_bp.GetNumLocations() == 1, "Only one C symbol matches")
+ c_bp = self.target.BreakpointCreateByRegex(
+ "func_from",
+ lldb.eLanguageTypeC,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ c_bp.GetNumLocations() == 1,
+ "Only one C symbol matches")
self.assertTrue(self.check_location_file(c_bp, 0, "a.c"))
-
- objc_bp = self.target.BreakpointCreateByRegex("func_from", lldb.eLanguageTypeObjC, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(objc_bp.GetNumLocations() == 0, "No ObjC symbol matches")
-
+
+ objc_bp = self.target.BreakpointCreateByRegex(
+ "func_from",
+ lldb.eLanguageTypeObjC,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ objc_bp.GetNumLocations() == 0,
+ "No ObjC symbol matches")
+
def test_by_name_breakpoint_language(self):
"""Test that the name regex breakpoint commands obey the language filter."""
@@ -60,26 +79,59 @@ class TestBreakpointLanguage(TestBase):
# Create a target by the debugger.
exe = os.path.join(os.getcwd(), "a.out")
error = lldb.SBError()
- # Don't read in dependencies so we don't come across false matches that
+ # Don't read in dependencies so we don't come across false matches that
# add unwanted breakpoint hits.
self.target = self.dbg.CreateTarget(exe, None, None, False, error)
self.assertTrue(self.target, VALID_TARGET)
- cpp_bp = self.target.BreakpointCreateByName("func_from_cpp", lldb.eFunctionNameTypeAuto, lldb.eLanguageTypeC_plus_plus, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(cpp_bp.GetNumLocations() == 1, "Only one C++ symbol matches")
+ cpp_bp = self.target.BreakpointCreateByName(
+ "func_from_cpp",
+ lldb.eFunctionNameTypeAuto,
+ lldb.eLanguageTypeC_plus_plus,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ cpp_bp.GetNumLocations() == 1,
+ "Only one C++ symbol matches")
self.assertTrue(self.check_location_file(cpp_bp, 0, "b.cpp"))
- no_cpp_bp = self.target.BreakpointCreateByName("func_from_c", lldb.eFunctionNameTypeAuto, lldb.eLanguageTypeC_plus_plus, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(no_cpp_bp.GetNumLocations() == 0, "And the C one doesn't match")
-
- c_bp = self.target.BreakpointCreateByName("func_from_c", lldb.eFunctionNameTypeAuto, lldb.eLanguageTypeC, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(c_bp.GetNumLocations() == 1, "Only one C symbol matches")
+ no_cpp_bp = self.target.BreakpointCreateByName(
+ "func_from_c",
+ lldb.eFunctionNameTypeAuto,
+ lldb.eLanguageTypeC_plus_plus,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ no_cpp_bp.GetNumLocations() == 0,
+ "And the C one doesn't match")
+
+ c_bp = self.target.BreakpointCreateByName(
+ "func_from_c",
+ lldb.eFunctionNameTypeAuto,
+ lldb.eLanguageTypeC,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ c_bp.GetNumLocations() == 1,
+ "Only one C symbol matches")
self.assertTrue(self.check_location_file(c_bp, 0, "a.c"))
-
- no_c_bp = self.target.BreakpointCreateByName("func_from_cpp", lldb.eFunctionNameTypeAuto, lldb.eLanguageTypeC, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(no_c_bp.GetNumLocations() == 0, "And the C++ one doesn't match")
-
- objc_bp = self.target.BreakpointCreateByName("func_from_cpp", lldb.eFunctionNameTypeAuto, lldb.eLanguageTypeObjC, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(objc_bp.GetNumLocations() == 0, "No ObjC symbol matches")
-
+ no_c_bp = self.target.BreakpointCreateByName(
+ "func_from_cpp",
+ lldb.eFunctionNameTypeAuto,
+ lldb.eLanguageTypeC,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ no_c_bp.GetNumLocations() == 0,
+ "And the C++ one doesn't match")
+
+ objc_bp = self.target.BreakpointCreateByName(
+ "func_from_cpp",
+ lldb.eFunctionNameTypeAuto,
+ lldb.eLanguageTypeObjC,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ objc_bp.GetNumLocations() == 0,
+ "No ObjC symbol matches")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test breakpoint commands for a breakpoin
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class BreakpointLocationsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -34,55 +35,72 @@ class BreakpointLocationsTestCase(TestBa
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# This should create a breakpoint with 3 locations.
- lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=3)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", self.line, num_expected_locations=3)
# The breakpoint list should show 3 locations.
- self.expect("breakpoint list -f", "Breakpoint locations shown correctly",
- substrs = ["1: file = 'main.c', line = %d, exact_match = 0, locations = 3" % self.line],
- patterns = ["where = a.out`func_inlined .+unresolved, hit count = 0",
- "where = a.out`main .+\[inlined\].+unresolved, hit count = 0"])
+ self.expect(
+ "breakpoint list -f",
+ "Breakpoint locations shown correctly",
+ substrs=[
+ "1: file = 'main.c', line = %d, exact_match = 0, locations = 3" %
+ self.line],
+ patterns=[
+ "where = a.out`func_inlined .+unresolved, hit count = 0",
+ "where = a.out`main .+\[inlined\].+unresolved, hit count = 0"])
# The 'breakpoint disable 3.*' command should fail gracefully.
self.expect("breakpoint disable 3.*",
"Disabling an invalid breakpoint should fail gracefully",
error=True,
- startstr = "error: '3' is not a valid breakpoint ID.")
+ startstr="error: '3' is not a valid breakpoint ID.")
# The 'breakpoint disable 1.*' command should disable all 3 locations.
- self.expect("breakpoint disable 1.*", "All 3 breakpoint locatons disabled correctly",
- startstr = "3 breakpoints disabled.")
+ self.expect(
+ "breakpoint disable 1.*",
+ "All 3 breakpoint locatons disabled correctly",
+ startstr="3 breakpoints disabled.")
# Run the program.
self.runCmd("run", RUN_SUCCEEDED)
# We should not stopped on any breakpoint at all.
self.expect("process status", "No stopping on any disabled breakpoint",
- patterns = ["^Process [0-9]+ exited with status = 0"])
+ patterns=["^Process [0-9]+ exited with status = 0"])
# The 'breakpoint enable 1.*' command should enable all 3 breakpoints.
- self.expect("breakpoint enable 1.*", "All 3 breakpoint locatons enabled correctly",
- startstr = "3 breakpoints enabled.")
+ self.expect(
+ "breakpoint enable 1.*",
+ "All 3 breakpoint locatons enabled correctly",
+ startstr="3 breakpoints enabled.")
# The 'breakpoint disable 1.1' command should disable 1 location.
- self.expect("breakpoint disable 1.1", "1 breakpoint locatons disabled correctly",
- startstr = "1 breakpoints disabled.")
+ self.expect(
+ "breakpoint disable 1.1",
+ "1 breakpoint locatons disabled correctly",
+ startstr="1 breakpoints disabled.")
- # Run the program againt. We should stop on the two breakpoint locations.
+ # Run the program againt. We should stop on the two breakpoint
+ # locations.
self.runCmd("run", RUN_SUCCEEDED)
# Stopped once.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ["stop reason = breakpoint 1."])
+ substrs=["stop reason = breakpoint 1."])
# Continue the program, there should be another stop.
self.runCmd("process continue")
# Stopped again.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ["stop reason = breakpoint 1."])
+ substrs=["stop reason = breakpoint 1."])
- # At this point, 1.1 has a hit count of 0 and the other a hit count of 1".
- self.expect("breakpoint list -f", "The breakpoints should report correct hit counts",
- patterns = ["1\.1: .+ unresolved, hit count = 0 +Options: disabled",
- "1\.2: .+ resolved, hit count = 1",
- "1\.3: .+ resolved, hit count = 1"])
+ # At this point, 1.1 has a hit count of 0 and the other a hit count of
+ # 1".
+ self.expect(
+ "breakpoint list -f",
+ "The breakpoints should report correct hit counts",
+ patterns=[
+ "1\.1: .+ unresolved, hit count = 0 +Options: disabled",
+ "1\.2: .+ resolved, hit count = 1",
+ "1\.3: .+ resolved, hit count = 1"])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,12 @@ Test breakpoint command for different op
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class BreakpointOptionsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -32,38 +32,59 @@ class BreakpointOptionsTestCase(TestBase
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# This should create a breakpoint with 1 locations.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, extra_options = "-K 1", num_expected_locations = 1)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, extra_options = "-K 0", num_expected_locations = 1)
+ lldbutil.run_break_set_by_file_and_line(
+ self,
+ "main.cpp",
+ self.line,
+ extra_options="-K 1",
+ num_expected_locations=1)
+ lldbutil.run_break_set_by_file_and_line(
+ self,
+ "main.cpp",
+ self.line,
+ extra_options="-K 0",
+ num_expected_locations=1)
# This should create a breakpoint 0 locations.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, extra_options = "-m 0", num_expected_locations = 0)
+ lldbutil.run_break_set_by_file_and_line(
+ self,
+ "main.cpp",
+ self.line,
+ extra_options="-m 0",
+ num_expected_locations=0)
# Run the program.
self.runCmd("run", RUN_SUCCEEDED)
# Stopped once.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ["stop reason = breakpoint 2."])
+ substrs=["stop reason = breakpoint 2."])
# Check the list of breakpoint.
- self.expect("breakpoint list -f", "Breakpoint locations shown correctly",
- substrs = ["1: file = 'main.cpp', line = %d, exact_match = 0, locations = 1" % self.line,
- "2: file = 'main.cpp', line = %d, exact_match = 0, locations = 1" % self.line,
- "3: file = 'main.cpp', line = %d, exact_match = 1, locations = 0" % self.line])
+ self.expect(
+ "breakpoint list -f",
+ "Breakpoint locations shown correctly",
+ substrs=[
+ "1: file = 'main.cpp', line = %d, exact_match = 0, locations = 1" %
+ self.line,
+ "2: file = 'main.cpp', line = %d, exact_match = 0, locations = 1" %
+ self.line,
+ "3: file = 'main.cpp', line = %d, exact_match = 1, locations = 0" %
+ self.line])
# Continue the program, there should be another stop.
self.runCmd("process continue")
# Stopped again.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ["stop reason = breakpoint 1."])
+ substrs=["stop reason = breakpoint 1."])
# Continue the program, we should exit.
self.runCmd("process continue")
# We should exit.
self.expect("process status", "Process exited successfully",
- patterns = ["^Process [0-9]+ exited with status = 0"])
+ patterns=["^Process [0-9]+ exited with status = 0"])
def breakpoint_options_language_test(self):
"""Test breakpoint command for language option."""
@@ -71,23 +92,34 @@ class BreakpointOptionsTestCase(TestBase
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# This should create a breakpoint with 1 locations.
- lldbutil.run_break_set_by_symbol (self, 'ns::func', sym_exact=False, extra_options = "-L c++", num_expected_locations=1)
+ lldbutil.run_break_set_by_symbol(
+ self,
+ 'ns::func',
+ sym_exact=False,
+ extra_options="-L c++",
+ num_expected_locations=1)
# This should create a breakpoint with 0 locations.
- lldbutil.run_break_set_by_symbol (self, 'ns::func', sym_exact=False, extra_options = "-L c", num_expected_locations=0)
+ lldbutil.run_break_set_by_symbol(
+ self,
+ 'ns::func',
+ sym_exact=False,
+ extra_options="-L c",
+ num_expected_locations=0)
self.runCmd("settings set target.language c")
- lldbutil.run_break_set_by_symbol (self, 'ns::func', sym_exact=False, num_expected_locations=0)
+ lldbutil.run_break_set_by_symbol(
+ self, 'ns::func', sym_exact=False, num_expected_locations=0)
# Run the program.
self.runCmd("run", RUN_SUCCEEDED)
# Stopped once.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ["stop reason = breakpoint 1."])
+ substrs=["stop reason = breakpoint 1."])
# Continue the program, we should exit.
self.runCmd("process continue")
# We should exit.
self.expect("process status", "Process exited successfully",
- patterns = ["^Process [0-9]+ exited with status = 0"])
+ patterns=["^Process [0-9]+ exited with status = 0"])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py Tue Sep 6 15:57:50 2016
@@ -6,6 +6,7 @@ import os
import lldb
from lldbsuite.test.lldbtest import *
+
class BreakpointSetRestart(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -16,12 +17,13 @@ class BreakpointSetRestart(TestBase):
cwd = os.getcwd()
exe = os.path.join(cwd, 'a.out')
-
+
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
self.dbg.SetAsync(True)
- process = target.LaunchSimple(None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
event = lldb.SBEvent()
@@ -29,15 +31,22 @@ class BreakpointSetRestart(TestBase):
while self.dbg.GetListener().WaitForEvent(2, event):
if lldb.SBProcess.GetStateFromEvent(event) == lldb.eStateRunning:
break
-
- bp = target.BreakpointCreateBySourceRegex(self.BREAKPOINT_TEXT,
- lldb.SBFileSpec(os.path.join(cwd, 'main.cpp')))
- self.assertTrue(bp.IsValid() and bp.GetNumLocations() == 1, VALID_BREAKPOINT)
+
+ bp = target.BreakpointCreateBySourceRegex(
+ self.BREAKPOINT_TEXT, lldb.SBFileSpec(
+ os.path.join(
+ cwd, 'main.cpp')))
+ self.assertTrue(
+ bp.IsValid() and bp.GetNumLocations() == 1,
+ VALID_BREAKPOINT)
while self.dbg.GetListener().WaitForEvent(2, event):
- if lldb.SBProcess.GetStateFromEvent(event) == lldb.eStateStopped and lldb.SBProcess.GetRestartedFromEvent(event):
+ if lldb.SBProcess.GetStateFromEvent(
+ event) == lldb.eStateStopped and lldb.SBProcess.GetRestartedFromEvent(event):
continue
if lldb.SBProcess.GetStateFromEvent(event) == lldb.eStateRunning:
continue
- self.fail("Setting a breakpoint generated an unexpected event: %s" % lldb.SBDebugger.StateAsCString(lldb.SBProcess.GetStateFromEvent(event)))
-
+ self.fail(
+ "Setting a breakpoint generated an unexpected event: %s" %
+ lldb.SBDebugger.StateAsCString(
+ lldb.SBProcess.GetStateFromEvent(event)))
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py Tue Sep 6 15:57:50 2016
@@ -4,7 +4,6 @@ Test breakpoint command with AT_comp_dir
from __future__ import print_function
-
import os
import shutil
import lldb
@@ -17,6 +16,7 @@ _EXE_NAME = 'CompDirSymLink' # Must mat
_SRC_FILE = 'main.cpp'
_COMP_DIR_SYM_LINK_PROP = 'plugin.symbol-file.dwarf.comp-dir-symlink-paths'
+
class CompDirSymLinkTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -32,14 +32,18 @@ class CompDirSymLinkTestCase(TestBase):
def test_symlink_paths_set(self):
pwd_symlink = self.create_src_symlink()
self.doBuild(pwd_symlink)
- self.runCmd("settings set %s %s" % (_COMP_DIR_SYM_LINK_PROP, pwd_symlink))
+ self.runCmd(
+ "settings set %s %s" %
+ (_COMP_DIR_SYM_LINK_PROP, pwd_symlink))
lldbutil.run_break_set_by_file_and_line(self, self.src_path, self.line)
@skipIf(hostoslist=no_match(["linux"]))
def test_symlink_paths_set_procselfcwd(self):
pwd_symlink = '/proc/self/cwd'
self.doBuild(pwd_symlink)
- self.runCmd("settings set %s %s" % (_COMP_DIR_SYM_LINK_PROP, pwd_symlink))
+ self.runCmd(
+ "settings set %s %s" %
+ (_COMP_DIR_SYM_LINK_PROP, pwd_symlink))
lldbutil.run_break_set_by_file_and_line(self, self.src_path, self.line)
@skipIf(hostoslist=["windows"])
@@ -47,12 +51,17 @@ class CompDirSymLinkTestCase(TestBase):
pwd_symlink = self.create_src_symlink()
self.doBuild(pwd_symlink)
self.runCmd('settings clear ' + _COMP_DIR_SYM_LINK_PROP)
- self.assertRaises(AssertionError, lldbutil.run_break_set_by_file_and_line, self, self.src_path, self.line)
+ self.assertRaises(
+ AssertionError,
+ lldbutil.run_break_set_by_file_and_line,
+ self,
+ self.src_path,
+ self.line)
def create_src_symlink(self):
pwd_symlink = os.path.join(os.getcwd(), 'pwd_symlink')
if os.path.exists(pwd_symlink):
- os.unlink(pwd_symlink)
+ os.unlink(pwd_symlink)
os.symlink(os.getcwd(), pwd_symlink)
self.addTearDownHook(lambda: os.remove(pwd_symlink))
return pwd_symlink
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py Tue Sep 6 15:57:50 2016
@@ -5,35 +5,42 @@ Test that we handle breakpoints on conse
from __future__ import print_function
-
import unittest2
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class ConsecutiveBreakpointsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
def prepare_test(self):
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
+ exe = os.path.join(os.getcwd(), "a.out")
# Create a target by the debugger.
self.target = self.dbg.CreateTarget(exe)
self.assertTrue(self.target, VALID_TARGET)
- breakpoint1 = self.target.BreakpointCreateBySourceRegex("Set breakpoint here", lldb.SBFileSpec("main.cpp"))
- self.assertTrue(breakpoint1 and breakpoint1.GetNumLocations() == 1, VALID_BREAKPOINT)
+ breakpoint1 = self.target.BreakpointCreateBySourceRegex(
+ "Set breakpoint here", lldb.SBFileSpec("main.cpp"))
+ self.assertTrue(
+ breakpoint1 and breakpoint1.GetNumLocations() == 1,
+ VALID_BREAKPOINT)
# Now launch the process, and do not stop at entry point.
- self.process = self.target.LaunchSimple (None, None, self.get_process_working_directory())
+ self.process = self.target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertIsNotNone(self.process, PROCESS_IS_VALID)
# We should be stopped at the first breakpoint
- self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(self.process, breakpoint1)
- self.assertIsNotNone(self.thread, "Expected one thread to be stopped at breakpoint 1")
+ self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(
+ self.process, breakpoint1)
+ self.assertIsNotNone(
+ self.thread,
+ "Expected one thread to be stopped at breakpoint 1")
# Set breakpoint to the next instruction
frame = self.thread.GetFrameAtIndex(0)
@@ -42,8 +49,11 @@ class ConsecutiveBreakpointsTestCase(Tes
instructions = self.target.ReadInstructions(address, 2)
self.assertTrue(len(instructions) == 2)
self.bkpt_address = instructions[1].GetAddress()
- self.breakpoint2 = self.target.BreakpointCreateByAddress(self.bkpt_address.GetLoadAddress(self.target))
- self.assertTrue(self.breakpoint2 and self.breakpoint2.GetNumLocations() == 1, VALID_BREAKPOINT)
+ self.breakpoint2 = self.target.BreakpointCreateByAddress(
+ self.bkpt_address.GetLoadAddress(self.target))
+ self.assertTrue(
+ self.breakpoint2 and self.breakpoint2.GetNumLocations() == 1,
+ VALID_BREAKPOINT)
def finish_test(self):
# Run the process until termination
@@ -58,8 +68,11 @@ class ConsecutiveBreakpointsTestCase(Tes
self.process.Continue()
self.assertEquals(self.process.GetState(), lldb.eStateStopped)
# We should be stopped at the second breakpoint
- self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(self.process, self.breakpoint2)
- self.assertIsNotNone(self.thread, "Expected one thread to be stopped at breakpoint 2")
+ self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(
+ self.process, self.breakpoint2)
+ self.assertIsNotNone(
+ self.thread,
+ "Expected one thread to be stopped at breakpoint 2")
self.finish_test()
@@ -72,10 +85,15 @@ class ConsecutiveBreakpointsTestCase(Tes
self.thread.StepInstruction(step_over)
self.assertEquals(self.process.GetState(), lldb.eStateStopped)
- self.assertEquals(self.thread.GetFrameAtIndex(0).GetPCAddress().GetLoadAddress(self.target),
- self.bkpt_address.GetLoadAddress(self.target))
- self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(self.process, self.breakpoint2)
- self.assertIsNotNone(self.thread, "Expected one thread to be stopped at breakpoint 2")
+ self.assertEquals(
+ self.thread.GetFrameAtIndex(0).GetPCAddress().GetLoadAddress(
+ self.target), self.bkpt_address.GetLoadAddress(
+ self.target))
+ self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(
+ self.process, self.breakpoint2)
+ self.assertIsNotNone(
+ self.thread,
+ "Expected one thread to be stopped at breakpoint 2")
self.finish_test()
@@ -84,8 +102,9 @@ class ConsecutiveBreakpointsTestCase(Tes
"""Test that single step stops, even though the second breakpoint is not valid."""
self.prepare_test()
- # Choose a thread other than the current one. A non-existing thread is fine.
- thread_index = self.process.GetNumThreads()+1
+ # Choose a thread other than the current one. A non-existing thread is
+ # fine.
+ thread_index = self.process.GetNumThreads() + 1
self.assertFalse(self.process.GetThreadAtIndex(thread_index).IsValid())
self.breakpoint2.SetThreadIndex(thread_index)
@@ -93,9 +112,13 @@ class ConsecutiveBreakpointsTestCase(Tes
self.thread.StepInstruction(step_over)
self.assertEquals(self.process.GetState(), lldb.eStateStopped)
- self.assertEquals(self.thread.GetFrameAtIndex(0).GetPCAddress().GetLoadAddress(self.target),
- self.bkpt_address.GetLoadAddress(self.target))
- self.assertEquals(self.thread.GetStopReason(), lldb.eStopReasonPlanComplete,
- "Stop reason should be 'plan complete'")
+ self.assertEquals(
+ self.thread.GetFrameAtIndex(0).GetPCAddress().GetLoadAddress(
+ self.target), self.bkpt_address.GetLoadAddress(
+ self.target))
+ self.assertEquals(
+ self.thread.GetStopReason(),
+ lldb.eStopReasonPlanComplete,
+ "Stop reason should be 'plan complete'")
self.finish_test()
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py Tue Sep 6 15:57:50 2016
@@ -5,60 +5,64 @@ Test lldb breakpoint ids.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestCPPBreakpointLocations(TestBase):
mydir = TestBase.compute_mydir(__file__)
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
- def test (self):
- self.build ()
- self.breakpoint_id_tests ()
+ def test(self):
+ self.build()
+ self.breakpoint_id_tests()
def verify_breakpoint_locations(self, target, bp_dict):
-
+
name = bp_dict['name']
names = bp_dict['loc_names']
- bp = target.BreakpointCreateByName (name)
- self.assertEquals(bp.GetNumLocations(), len(names), "Make sure we find the right number of breakpoint locations")
-
+ bp = target.BreakpointCreateByName(name)
+ self.assertEquals(
+ bp.GetNumLocations(),
+ len(names),
+ "Make sure we find the right number of breakpoint locations")
+
bp_loc_names = list()
for bp_loc in bp:
bp_loc_names.append(bp_loc.GetAddress().GetFunction().GetName())
-
+
for name in names:
found = name in bp_loc_names
if not found:
print("Didn't find '%s' in: %s" % (name, bp_loc_names))
- self.assertTrue (found, "Make sure we find all required locations")
-
- def breakpoint_id_tests (self):
-
+ self.assertTrue(found, "Make sure we find all required locations")
+
+ def breakpoint_id_tests(self):
+
# Create a target by the debugger.
exe = os.path.join(os.getcwd(), "a.out")
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
bp_dicts = [
- { 'name' : 'func1', 'loc_names' : [ 'a::c::func1()', 'b::c::func1()'] },
- { 'name' : 'func2', 'loc_names' : [ 'a::c::func2()', 'c::d::func2()'] },
- { 'name' : 'func3', 'loc_names' : [ 'a::c::func3()', 'b::c::func3()', 'c::d::func3()'] },
- { 'name' : 'c::func1', 'loc_names' : [ 'a::c::func1()', 'b::c::func1()'] },
- { 'name' : 'c::func2', 'loc_names' : [ 'a::c::func2()'] },
- { 'name' : 'c::func3', 'loc_names' : [ 'a::c::func3()', 'b::c::func3()'] },
- { 'name' : 'a::c::func1', 'loc_names' : [ 'a::c::func1()'] },
- { 'name' : 'b::c::func1', 'loc_names' : [ 'b::c::func1()'] },
- { 'name' : 'c::d::func2', 'loc_names' : [ 'c::d::func2()'] },
- { 'name' : 'a::c::func1()', 'loc_names' : [ 'a::c::func1()'] },
- { 'name' : 'b::c::func1()', 'loc_names' : [ 'b::c::func1()'] },
- { 'name' : 'c::d::func2()', 'loc_names' : [ 'c::d::func2()'] },
+ {'name': 'func1', 'loc_names': ['a::c::func1()', 'b::c::func1()']},
+ {'name': 'func2', 'loc_names': ['a::c::func2()', 'c::d::func2()']},
+ {'name': 'func3', 'loc_names': ['a::c::func3()', 'b::c::func3()', 'c::d::func3()']},
+ {'name': 'c::func1', 'loc_names': ['a::c::func1()', 'b::c::func1()']},
+ {'name': 'c::func2', 'loc_names': ['a::c::func2()']},
+ {'name': 'c::func3', 'loc_names': ['a::c::func3()', 'b::c::func3()']},
+ {'name': 'a::c::func1', 'loc_names': ['a::c::func1()']},
+ {'name': 'b::c::func1', 'loc_names': ['b::c::func1()']},
+ {'name': 'c::d::func2', 'loc_names': ['c::d::func2()']},
+ {'name': 'a::c::func1()', 'loc_names': ['a::c::func1()']},
+ {'name': 'b::c::func1()', 'loc_names': ['b::c::func1()']},
+ {'name': 'c::d::func2()', 'loc_names': ['c::d::func2()']},
]
-
+
for bp_dict in bp_dicts:
self.verify_breakpoint_locations(target, bp_dict)
@@ -68,28 +72,43 @@ class TestCPPBreakpointLocations(TestBas
exe = os.path.join(os.getcwd(), "a.out")
target = self.dbg.CreateTarget(exe)
- # Don't skip prologue, so we can check the breakpoint address more easily
+ # Don't skip prologue, so we can check the breakpoint address more
+ # easily
self.runCmd("settings set target.skip-prologue false")
try:
names = ['~c', 'c::~c', 'c::~c()']
loc_names = {'a::c::~c()', 'b::c::~c()'}
- # TODO: For windows targets we should put windows mangled names here
- symbols = ['_ZN1a1cD1Ev', '_ZN1a1cD2Ev', '_ZN1b1cD1Ev', '_ZN1b1cD2Ev']
+ # TODO: For windows targets we should put windows mangled names
+ # here
+ symbols = [
+ '_ZN1a1cD1Ev',
+ '_ZN1a1cD2Ev',
+ '_ZN1b1cD1Ev',
+ '_ZN1b1cD2Ev']
for name in names:
bp = target.BreakpointCreateByName(name)
- bp_loc_names = { bp_loc.GetAddress().GetFunction().GetName() for bp_loc in bp }
- self.assertEquals(bp_loc_names, loc_names, "Breakpoint set on the correct symbol")
+ bp_loc_names = {bp_loc.GetAddress().GetFunction().GetName()
+ for bp_loc in bp}
+ self.assertEquals(
+ bp_loc_names,
+ loc_names,
+ "Breakpoint set on the correct symbol")
- bp_addresses = { bp_loc.GetLoadAddress() for bp_loc in bp }
+ bp_addresses = {bp_loc.GetLoadAddress() for bp_loc in bp}
symbol_addresses = set()
for symbol in symbols:
sc_list = target.FindSymbols(symbol, lldb.eSymbolTypeCode)
- self.assertEquals(sc_list.GetSize(), 1, "Found symbol " + symbol)
+ self.assertEquals(
+ sc_list.GetSize(), 1, "Found symbol " + symbol)
symbol = sc_list.GetContextAtIndex(0).GetSymbol()
- symbol_addresses.add(symbol.GetStartAddress().GetLoadAddress(target))
+ symbol_addresses.add(
+ symbol.GetStartAddress().GetLoadAddress(target))
- self.assertEquals(symbol_addresses, bp_addresses, "Breakpoint set on correct address")
+ self.assertEquals(
+ symbol_addresses,
+ bp_addresses,
+ "Breakpoint set on correct address")
finally:
self.runCmd("settings clear target.skip-prologue")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py Tue Sep 6 15:57:50 2016
@@ -5,7 +5,6 @@ Test that you can set breakpoint and hit
from __future__ import print_function
-
import os
import re
import sys
@@ -14,6 +13,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestCPPExceptionBreakpoint (TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -24,26 +24,31 @@ class TestCPPExceptionBreakpoint (TestBa
def test_cpp_exception_breakpoint(self):
"""Test setting and hitting the C++ exception breakpoint."""
self.build()
- self.do_cpp_exception_bkpt ()
+ self.do_cpp_exception_bkpt()
- def setUp (self):
+ def setUp(self):
TestBase.setUp(self)
self.main_source = "main.c"
self.main_source_spec = lldb.SBFileSpec(self.main_source)
-
- def do_cpp_exception_bkpt (self):
+ def do_cpp_exception_bkpt(self):
exe = os.path.join(os.getcwd(), "a.out")
error = lldb.SBError()
self.target = self.dbg.CreateTarget(exe)
self.assertTrue(self.target, VALID_TARGET)
- exception_bkpt = self.target.BreakpointCreateForException(lldb.eLanguageTypeC_plus_plus, False, True)
- self.assertTrue (exception_bkpt.IsValid(), "Created exception breakpoint.")
+ exception_bkpt = self.target.BreakpointCreateForException(
+ lldb.eLanguageTypeC_plus_plus, False, True)
+ self.assertTrue(
+ exception_bkpt.IsValid(),
+ "Created exception breakpoint.")
- process = self.target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = self.target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
-
- thread_list = lldbutil.get_threads_stopped_at_breakpoint (process, exception_bkpt)
- self.assertTrue (len(thread_list) == 1, "One thread stopped at the exception breakpoint.")
+
+ thread_list = lldbutil.get_threads_stopped_at_breakpoint(
+ process, exception_bkpt)
+ self.assertTrue(len(thread_list) == 1,
+ "One thread stopped at the exception breakpoint.")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DebugBreakTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,19 +24,23 @@ class DebugBreakTestCase(TestBase):
# Run the program.
target = self.dbg.CreateTarget(exe)
- process = target.LaunchSimple(None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
# We've hit the first stop, so grab the frame.
self.assertEqual(process.GetState(), lldb.eStateStopped)
- stop_reason = lldb.eStopReasonException if (lldbplatformutil.getPlatform()=="windows" or lldbplatformutil.getPlatform()=="macosx") else lldb.eStopReasonSignal
+ stop_reason = lldb.eStopReasonException if (lldbplatformutil.getPlatform(
+ ) == "windows" or lldbplatformutil.getPlatform() == "macosx") else lldb.eStopReasonSignal
thread = lldbutil.get_stopped_thread(process, stop_reason)
- self.assertIsNotNone(thread, "Unable to find thread stopped at the __debugbreak()")
+ self.assertIsNotNone(
+ thread, "Unable to find thread stopped at the __debugbreak()")
frame = thread.GetFrameAtIndex(0)
# We should be in funciton 'bar'.
self.assertTrue(frame.IsValid())
function_name = frame.GetFunctionName()
- self.assertTrue('bar' in function_name, "Unexpected function name {}".format(function_name))
+ self.assertTrue('bar' in function_name,
+ "Unexpected function name {}".format(function_name))
# We should be able to evaluate the parameter foo.
value = frame.EvaluateExpression('*foo')
@@ -45,10 +50,10 @@ class DebugBreakTestCase(TestBase):
# subsequent stop.
counter = 1
while counter < 20:
- value = frame.EvaluateExpression('count')
- self.assertEqual(value.GetValueAsSigned(), counter)
- counter += 2
- process.Continue()
+ value = frame.EvaluateExpression('count')
+ self.assertEqual(value.GetValueAsSigned(), counter)
+ counter += 2
+ process.Continue()
# The inferior should exit after the last iteration.
self.assertEqual(process.GetState(), lldb.eStateExited)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test breakpoint commands set before we h
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class BreakpointInDummyTarget (TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -25,43 +26,49 @@ class BreakpointInDummyTarget (TestBase)
TestBase.setUp(self)
# Find the line number to break inside main().
self.line = line_number('main.c', 'Set a breakpoint on this line.')
- self.line2 = line_number ('main.c', 'Set another on this line.')
+ self.line2 = line_number('main.c', 'Set another on this line.')
def dummy_breakpoint_test(self):
"""Test breakpoint set before we have a target. """
# This should create a breakpoint with 3 locations.
- lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=0)
- lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line2, num_expected_locations=0)
-
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", self.line, num_expected_locations=0)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", self.line2, num_expected_locations=0)
+
# This is the function to remove breakpoints from the dummy target
# to get a clean slate for the next test case.
def cleanup():
self.runCmd('breakpoint delete -D -f', check=False)
self.runCmd('breakpoint list', check=False)
-
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
-
+
exe = os.path.join(os.getcwd(), "a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# The breakpoint list should show 3 locations.
- self.expect("breakpoint list -f", "Breakpoint locations shown correctly",
- substrs = ["1: file = 'main.c', line = %d, exact_match = 0, locations = 1" % self.line,
- "2: file = 'main.c', line = %d, exact_match = 0, locations = 1" % self.line2])
+ self.expect(
+ "breakpoint list -f",
+ "Breakpoint locations shown correctly",
+ substrs=[
+ "1: file = 'main.c', line = %d, exact_match = 0, locations = 1" %
+ self.line,
+ "2: file = 'main.c', line = %d, exact_match = 0, locations = 1" %
+ self.line2])
# Run the program.
self.runCmd("run", RUN_SUCCEEDED)
# Stopped once.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ["stop reason = breakpoint 1."])
+ substrs=["stop reason = breakpoint 1."])
# Continue the program, there should be another stop.
self.runCmd("process continue")
# Stopped again.
self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ["stop reason = breakpoint 2."])
+ substrs=["stop reason = breakpoint 2."])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py Tue Sep 6 15:57:50 2016
@@ -6,12 +6,13 @@ another source file) works correctly.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class InlinedBreakpointsTestCase(TestBase):
"""Bug fixed: rdar://problem/8464339"""
@@ -26,32 +27,43 @@ class InlinedBreakpointsTestCase(TestBas
# Call super's setUp().
TestBase.setUp(self)
# Find the line number to break inside basic_type.cpp.
- self.line = line_number('basic_type.cpp', '// Set break point at this line.')
+ self.line = line_number(
+ 'basic_type.cpp',
+ '// Set break point at this line.')
def inlined_breakpoints(self):
"""Test 'b basic_types.cpp:176' does break (where int.cpp includes basic_type.cpp)."""
exe = os.path.join(os.getcwd(), "a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
- # With the inline-breakpoint-strategy, our file+line breakpoint should not resolve to a location.
+ # With the inline-breakpoint-strategy, our file+line breakpoint should
+ # not resolve to a location.
self.runCmd('settings set target.inline-breakpoint-strategy headers')
- # Set a breakpoint and fail because it is in an inlined source implemenation file
- lldbutil.run_break_set_by_file_and_line (self, "basic_type.cpp", self.line, num_expected_locations=0)
+ # Set a breakpoint and fail because it is in an inlined source
+ # implemenation file
+ lldbutil.run_break_set_by_file_and_line(
+ self, "basic_type.cpp", self.line, num_expected_locations=0)
- # Now enable breakpoints in implementation files and see the breakpoint set succeed
+ # Now enable breakpoints in implementation files and see the breakpoint
+ # set succeed
self.runCmd('settings set target.inline-breakpoint-strategy always')
# And add hooks to restore the settings during tearDown().
- self.addTearDownHook(
- lambda: self.runCmd("settings set target.inline-breakpoint-strategy always"))
+ self.addTearDownHook(lambda: self.runCmd(
+ "settings set target.inline-breakpoint-strategy always"))
- lldbutil.run_break_set_by_file_and_line (self, "basic_type.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self,
+ "basic_type.cpp",
+ self.line,
+ num_expected_locations=1,
+ loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
# And it should break at basic_type.cpp:176.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint',
- 'basic_type.cpp:%d' % self.line])
+ substrs=['stopped',
+ 'stop reason = breakpoint',
+ 'basic_type.cpp:%d' % self.line])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py Tue Sep 6 15:57:50 2016
@@ -6,8 +6,8 @@ parser.
from __future__ import print_function
-
-import os, time
+import os
+import time
import shutil
import subprocess
import lldb
@@ -15,6 +15,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
@skipUnlessDarwin
class TestObjCBreakpoints(TestBase):
@@ -34,20 +35,37 @@ class TestObjCBreakpoints(TestBase):
self.line = line_number(self.main_source, '// Set breakpoint here')
def check_category_breakpoints(self):
- name_bp = self.target.BreakpointCreateByName ("myCategoryFunction")
- selector_bp = self.target.BreakpointCreateByName ("myCategoryFunction", lldb.eFunctionNameTypeSelector, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(name_bp.GetNumLocations() == selector_bp.GetNumLocations(), 'Make sure setting a breakpoint by name "myCategoryFunction" sets a breakpoint even though it is in a category')
+ name_bp = self.target.BreakpointCreateByName("myCategoryFunction")
+ selector_bp = self.target.BreakpointCreateByName(
+ "myCategoryFunction",
+ lldb.eFunctionNameTypeSelector,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ name_bp.GetNumLocations() == selector_bp.GetNumLocations(),
+ 'Make sure setting a breakpoint by name "myCategoryFunction" sets a breakpoint even though it is in a category')
for bp_loc in selector_bp:
function_name = bp_loc.GetAddress().GetSymbol().GetName()
- self.assertTrue(" myCategoryFunction]" in function_name, 'Make sure all function names have " myCategoryFunction]" in their names')
-
- category_bp = self.target.BreakpointCreateByName ("-[MyClass(MyCategory) myCategoryFunction]")
- stripped_bp = self.target.BreakpointCreateByName ("-[MyClass myCategoryFunction]")
- stripped2_bp = self.target.BreakpointCreateByName ("[MyClass myCategoryFunction]")
- self.assertTrue(category_bp.GetNumLocations() == 1, "Make sure we can set a breakpoint using a full objective C function name with the category included (-[MyClass(MyCategory) myCategoryFunction])")
- self.assertTrue(stripped_bp.GetNumLocations() == 1, "Make sure we can set a breakpoint using a full objective C function name without the category included (-[MyClass myCategoryFunction])")
- self.assertTrue(stripped2_bp.GetNumLocations() == 1, "Make sure we can set a breakpoint using a full objective C function name without the category included ([MyClass myCategoryFunction])")
-
+ self.assertTrue(
+ " myCategoryFunction]" in function_name,
+ 'Make sure all function names have " myCategoryFunction]" in their names')
+
+ category_bp = self.target.BreakpointCreateByName(
+ "-[MyClass(MyCategory) myCategoryFunction]")
+ stripped_bp = self.target.BreakpointCreateByName(
+ "-[MyClass myCategoryFunction]")
+ stripped2_bp = self.target.BreakpointCreateByName(
+ "[MyClass myCategoryFunction]")
+ self.assertTrue(
+ category_bp.GetNumLocations() == 1,
+ "Make sure we can set a breakpoint using a full objective C function name with the category included (-[MyClass(MyCategory) myCategoryFunction])")
+ self.assertTrue(
+ stripped_bp.GetNumLocations() == 1,
+ "Make sure we can set a breakpoint using a full objective C function name without the category included (-[MyClass myCategoryFunction])")
+ self.assertTrue(
+ stripped2_bp.GetNumLocations() == 1,
+ "Make sure we can set a breakpoint using a full objective C function name without the category included ([MyClass myCategoryFunction])")
+
def check_objc_breakpoints(self, have_dsym):
"""Test constant string generation amd comparison by the expression parser."""
@@ -60,36 +78,55 @@ class TestObjCBreakpoints(TestBase):
self.assertTrue(self.target, VALID_TARGET)
#----------------------------------------------------------------------
- # Set breakpoints on all selectors whose name is "count". This should
- # catch breakpoints that are both C functions _and_ anything whose
+ # Set breakpoints on all selectors whose name is "count". This should
+ # catch breakpoints that are both C functions _and_ anything whose
# selector is "count" because just looking at "count" we can't tell
# definitively if the name is a selector or a C function
#----------------------------------------------------------------------
- name_bp = self.target.BreakpointCreateByName ("count")
- selector_bp = self.target.BreakpointCreateByName ("count", lldb.eFunctionNameTypeSelector, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(name_bp.GetNumLocations() >= selector_bp.GetNumLocations(), 'Make sure we get at least the same amount of breakpoints if not more when setting by name "count"')
- self.assertTrue(selector_bp.GetNumLocations() > 50, 'Make sure we find a lot of "count" selectors') # There are 93 on the latest MacOSX
+ name_bp = self.target.BreakpointCreateByName("count")
+ selector_bp = self.target.BreakpointCreateByName(
+ "count",
+ lldb.eFunctionNameTypeSelector,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ name_bp.GetNumLocations() >= selector_bp.GetNumLocations(),
+ 'Make sure we get at least the same amount of breakpoints if not more when setting by name "count"')
+ self.assertTrue(
+ selector_bp.GetNumLocations() > 50,
+ 'Make sure we find a lot of "count" selectors') # There are 93 on the latest MacOSX
for bp_loc in selector_bp:
function_name = bp_loc.GetAddress().GetSymbol().GetName()
- self.assertTrue(" count]" in function_name, 'Make sure all function names have " count]" in their names')
+ self.assertTrue(
+ " count]" in function_name,
+ 'Make sure all function names have " count]" in their names')
#----------------------------------------------------------------------
# Set breakpoints on all selectors whose name is "isEqual:". This should
# catch breakpoints that are only ObjC selectors because no C function
# can end with a :
#----------------------------------------------------------------------
- name_bp = self.target.BreakpointCreateByName ("isEqual:")
- selector_bp = self.target.BreakpointCreateByName ("isEqual:", lldb.eFunctionNameTypeSelector, lldb.SBFileSpecList(), lldb.SBFileSpecList())
- self.assertTrue(name_bp.GetNumLocations() == selector_bp.GetNumLocations(), 'Make sure setting a breakpoint by name "isEqual:" only sets selector breakpoints')
+ name_bp = self.target.BreakpointCreateByName("isEqual:")
+ selector_bp = self.target.BreakpointCreateByName(
+ "isEqual:",
+ lldb.eFunctionNameTypeSelector,
+ lldb.SBFileSpecList(),
+ lldb.SBFileSpecList())
+ self.assertTrue(
+ name_bp.GetNumLocations() == selector_bp.GetNumLocations(),
+ 'Make sure setting a breakpoint by name "isEqual:" only sets selector breakpoints')
for bp_loc in selector_bp:
function_name = bp_loc.GetAddress().GetSymbol().GetName()
- self.assertTrue(" isEqual:]" in function_name, 'Make sure all function names have " isEqual:]" in their names')
-
+ self.assertTrue(
+ " isEqual:]" in function_name,
+ 'Make sure all function names have " isEqual:]" in their names')
+
self.check_category_breakpoints()
-
+
if have_dsym:
shutil.rmtree(exe + ".dSYM")
- self.assertTrue(subprocess.call(['/usr/bin/strip', '-Sx', exe]) == 0, 'stripping dylib succeeded')
-
+ self.assertTrue(subprocess.call(
+ ['/usr/bin/strip', '-Sx', exe]) == 0, 'stripping dylib succeeded')
+
# Check breakpoints again, this time using the symbol table only
self.check_category_breakpoints()
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py Tue Sep 6 15:57:50 2016
@@ -5,26 +5,27 @@ This test just tests the source file & f
from __future__ import print_function
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestSourceRegexBreakpoints(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def test_location (self):
+ def test_location(self):
self.build()
self.source_regex_locations()
- def test_restrictions (self):
- self.build ()
- self.source_regex_restrictions ()
-
+ def test_restrictions(self):
+ self.build()
+ self.source_regex_restrictions()
- def source_regex_locations (self):
+ def source_regex_locations(self):
""" Test that restricting source expressions to files & to functions. """
# Create a target by the debugger.
exe = os.path.join(os.getcwd(), "a.out")
@@ -39,24 +40,28 @@ class TestSourceRegexBreakpoints(TestBas
func_names.AppendString("a_func")
source_regex = "Set . breakpoint here"
- main_break = target.BreakpointCreateBySourceRegex (source_regex,
- lldb.SBFileSpecList(),
- target_files,
- func_names)
+ main_break = target.BreakpointCreateBySourceRegex(
+ source_regex, lldb.SBFileSpecList(), target_files, func_names)
num_locations = main_break.GetNumLocations()
- self.assertTrue(num_locations == 1, "a.c in a_func should give one breakpoint, got %d."%(num_locations))
+ self.assertTrue(
+ num_locations == 1,
+ "a.c in a_func should give one breakpoint, got %d." %
+ (num_locations))
loc = main_break.GetLocationAtIndex(0)
self.assertTrue(loc.IsValid(), "Got a valid location.")
address = loc.GetAddress()
- self.assertTrue(address.IsValid(), "Got a valid address from the location.")
-
+ self.assertTrue(
+ address.IsValid(),
+ "Got a valid address from the location.")
+
a_func_line = line_number("a.c", "Set A breakpoint here")
line_entry = address.GetLineEntry()
self.assertTrue(line_entry.IsValid(), "Got a valid line entry.")
- self.assertTrue(line_entry.line == a_func_line, "Our line number matches the one lldbtest found.")
+ self.assertTrue(line_entry.line == a_func_line,
+ "Our line number matches the one lldbtest found.")
- def source_regex_restrictions (self):
+ def source_regex_restrictions(self):
""" Test that restricting source expressions to files & to functions. """
# Create a target by the debugger.
exe = os.path.join(os.getcwd(), "a.out")
@@ -67,34 +72,35 @@ class TestSourceRegexBreakpoints(TestBas
target_files = lldb.SBFileSpecList()
target_files.Append(lldb.SBFileSpec("main.c"))
source_regex = "Set . breakpoint here"
- main_break = target.BreakpointCreateBySourceRegex (source_regex,
- lldb.SBFileSpecList(),
- target_files,
- lldb.SBStringList())
+ main_break = target.BreakpointCreateBySourceRegex(
+ source_regex, lldb.SBFileSpecList(), target_files, lldb.SBStringList())
num_locations = main_break.GetNumLocations()
- self.assertTrue(num_locations == 2, "main.c should have 2 matches, got %d."%(num_locations))
+ self.assertTrue(
+ num_locations == 2,
+ "main.c should have 2 matches, got %d." %
+ (num_locations))
# Now look in both files:
target_files.Append(lldb.SBFileSpec("a.c"))
- main_break = target.BreakpointCreateBySourceRegex (source_regex,
- lldb.SBFileSpecList(),
- target_files,
- lldb.SBStringList())
+ main_break = target.BreakpointCreateBySourceRegex(
+ source_regex, lldb.SBFileSpecList(), target_files, lldb.SBStringList())
- num_locations =main_break.GetNumLocations()
- self.assertTrue(num_locations == 4, "main.c and a.c should have 4 matches, got %d."%(num_locations))
+ num_locations = main_break.GetNumLocations()
+ self.assertTrue(
+ num_locations == 4,
+ "main.c and a.c should have 4 matches, got %d." %
+ (num_locations))
# Now restrict it to functions:
func_names = lldb.SBStringList()
func_names.AppendString("main_func")
- main_break = target.BreakpointCreateBySourceRegex (source_regex,
- lldb.SBFileSpecList(),
- target_files,
- func_names)
-
- num_locations =main_break.GetNumLocations()
- self.assertTrue(num_locations == 2, "main_func in main.c and a.c should have 2 matches, got %d."%(num_locations))
-
+ main_break = target.BreakpointCreateBySourceRegex(
+ source_regex, lldb.SBFileSpecList(), target_files, func_names)
+ num_locations = main_break.GetNumLocations()
+ self.assertTrue(
+ num_locations == 2,
+ "main_func in main.c and a.c should have 2 matches, got %d." %
+ (num_locations))
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,13 @@ Test the command history mechanism
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class CommandHistoryTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -19,52 +19,90 @@ class CommandHistoryTestCase(TestBase):
@no_debug_info_test
def test_history(self):
self.runCmd('command history --clear', inHistory=False)
- self.runCmd('breakpoint list', check=False, inHistory=True) #0
- self.runCmd('register read', check=False, inHistory=True) #1
- self.runCmd('apropos hello', check=False, inHistory=True) #2
- self.runCmd('memory write', check=False, inHistory=True) #3
- self.runCmd('log list', check=False, inHistory=True) #4
- self.runCmd('disassemble', check=False, inHistory=True) #5
- self.runCmd('expression 1', check=False, inHistory=True) #6
- self.runCmd('type summary list -w default', check=False, inHistory=True) #7
- self.runCmd('version', check=False, inHistory=True) #8
- self.runCmd('frame select 1', check=False, inHistory=True) #9
-
- self.expect ("command history -s 3 -c 3", inHistory=True,
- substrs = ['3: memory write','4: log list','5: disassemble'])
-
- self.expect ("command history -s 3 -e 3", inHistory=True,
- substrs = ['3: memory write'])
-
- self.expect ("command history -s 6 -e 7", inHistory=True,
- substrs = ['6: expression 1','7: type summary list -w default'])
-
- self.expect ("command history -c 2", inHistory=True,
- substrs = ['0: breakpoint list','1: register read'])
-
- self.expect ("command history -e 3 -c 1", inHistory=True,
- substrs = ['3: memory write'])
-
- self.expect ("command history -e 2", inHistory=True,
- substrs = ['0: breakpoint list','1: register read','2: apropos hello'])
-
- self.expect ("command history -s 12", inHistory=True,
- substrs = ['12: command history -s 6 -e 7','13: command history -c 2','14: command history -e 3 -c 1','15: command history -e 2','16: command history -s 12'])
-
- self.expect ("command history -s end -c 3", inHistory=True,
- substrs = ['15: command history -e 2','16: command history -s 12','17: command history -s end -c 3'])
-
- self.expect ("command history -s end -e 15", inHistory=True,
- substrs = ['15: command history -e 2','16: command history -s 12','17: command history -s end -c 3','command history -s end -e 15'])
-
- self.expect ("command history -s 5 -c 1", inHistory=True,
- substrs = ['5: disassemble'])
-
- self.expect ("command history -c 1 -s 5", inHistory=True,
- substrs = ['5: disassemble'])
-
- self.expect ("command history -c 1 -e 3", inHistory=True,
- substrs = ['3: memory write'])
-
- self.expect ("command history -c 1 -e 3 -s 5",error=True, inHistory=True,
- substrs = ['error: --count, --start-index and --end-index cannot be all specified in the same invocation'])
+ self.runCmd('breakpoint list', check=False, inHistory=True) # 0
+ self.runCmd('register read', check=False, inHistory=True) # 1
+ self.runCmd('apropos hello', check=False, inHistory=True) # 2
+ self.runCmd('memory write', check=False, inHistory=True) # 3
+ self.runCmd('log list', check=False, inHistory=True) # 4
+ self.runCmd('disassemble', check=False, inHistory=True) # 5
+ self.runCmd('expression 1', check=False, inHistory=True) # 6
+ self.runCmd(
+ 'type summary list -w default',
+ check=False,
+ inHistory=True) # 7
+ self.runCmd('version', check=False, inHistory=True) # 8
+ self.runCmd('frame select 1', check=False, inHistory=True) # 9
+
+ self.expect(
+ "command history -s 3 -c 3",
+ inHistory=True,
+ substrs=[
+ '3: memory write',
+ '4: log list',
+ '5: disassemble'])
+
+ self.expect("command history -s 3 -e 3", inHistory=True,
+ substrs=['3: memory write'])
+
+ self.expect(
+ "command history -s 6 -e 7",
+ inHistory=True,
+ substrs=[
+ '6: expression 1',
+ '7: type summary list -w default'])
+
+ self.expect("command history -c 2", inHistory=True,
+ substrs=['0: breakpoint list', '1: register read'])
+
+ self.expect("command history -e 3 -c 1", inHistory=True,
+ substrs=['3: memory write'])
+
+ self.expect(
+ "command history -e 2",
+ inHistory=True,
+ substrs=[
+ '0: breakpoint list',
+ '1: register read',
+ '2: apropos hello'])
+
+ self.expect(
+ "command history -s 12",
+ inHistory=True,
+ substrs=[
+ '12: command history -s 6 -e 7',
+ '13: command history -c 2',
+ '14: command history -e 3 -c 1',
+ '15: command history -e 2',
+ '16: command history -s 12'])
+
+ self.expect(
+ "command history -s end -c 3",
+ inHistory=True,
+ substrs=[
+ '15: command history -e 2',
+ '16: command history -s 12',
+ '17: command history -s end -c 3'])
+
+ self.expect(
+ "command history -s end -e 15",
+ inHistory=True,
+ substrs=[
+ '15: command history -e 2',
+ '16: command history -s 12',
+ '17: command history -s end -c 3',
+ 'command history -s end -e 15'])
+
+ self.expect("command history -s 5 -c 1", inHistory=True,
+ substrs=['5: disassemble'])
+
+ self.expect("command history -c 1 -s 5", inHistory=True,
+ substrs=['5: disassemble'])
+
+ self.expect("command history -c 1 -e 3", inHistory=True,
+ substrs=['3: memory write'])
+
+ self.expect(
+ "command history -c 1 -e 3 -s 5",
+ error=True,
+ inHistory=True,
+ substrs=['error: --count, --start-index and --end-index cannot be all specified in the same invocation'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py Tue Sep 6 15:57:50 2016
@@ -5,18 +5,20 @@ Test lldb 'commands regex' command which
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class CommandRegexTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+ @expectedFailureAll(
+ hostoslist=["windows"],
+ bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
@no_debug_info_test
def test_command_regex(self):
"""Test a simple scenario of 'command regex' invocation and subsequent use."""
@@ -25,7 +27,8 @@ class CommandRegexTestCase(TestBase):
regex_prompt = "Enter one of more sed substitution commands in the form: 's/<regex>/<subst>/'.\r\nTerminate the substitution list with an empty line.\r\n"
regex_prompt1 = "\r\n"
- child = pexpect.spawn('%s %s' % (lldbtest_config.lldbExec, self.lldbOption))
+ child = pexpect.spawn('%s %s' %
+ (lldbtest_config.lldbExec, self.lldbOption))
# Turn on logging for what the child sends back.
if self.TraceOn():
child.logfile_read = sys.stdout
@@ -44,11 +47,13 @@ class CommandRegexTestCase(TestBase):
child.sendline('Help__')
# If we see the familiar 'help' output, the test is done.
child.expect('Debugger commands:')
- # Try and incorrectly remove "Help__" using "command unalias" and verify we fail
+ # Try and incorrectly remove "Help__" using "command unalias" and
+ # verify we fail
child.sendline('command unalias Help__')
- child.expect_exact("error: 'Help__' is not an alias, it is a debugger command which can be removed using the 'command delete' command")
+ child.expect_exact(
+ "error: 'Help__' is not an alias, it is a debugger command which can be removed using the 'command delete' command")
child.expect_exact(prompt)
-
+
# Delete the regex command using "command delete"
child.sendline('command delete Help__')
child.expect_exact(prompt)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py Tue Sep 6 15:57:50 2016
@@ -5,33 +5,34 @@ Test lldb Python commands.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
+
class CmdPythonTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def test (self):
- self.build ()
- self.pycmd_tests ()
+ def test(self):
+ self.build()
+ self.pycmd_tests()
- def pycmd_tests (self):
+ def pycmd_tests(self):
self.runCmd("command source py_import")
# Verify command that specifies eCommandRequiresTarget returns failure
# without a target.
self.expect('targetname',
- substrs = ['a.out'], matching=False, error=True)
+ substrs=['a.out'], matching=False, error=True)
- exe = os.path.join (os.getcwd(), "a.out")
+ exe = os.path.join(os.getcwd(), "a.out")
self.expect("file " + exe,
- patterns = [ "Current executable set to .*a.out" ])
+ patterns=["Current executable set to .*a.out"])
self.expect('targetname',
- substrs = ['a.out'], matching=True, error=False)
+ substrs=['a.out'], matching=True, error=False)
# This is the function to remove the custom commands in order to have a
# clean slate for the next test case.
@@ -57,86 +58,89 @@ class CmdPythonTestCase(TestBase):
self.HideStdout()
self.expect('welcome Enrico',
- substrs = ['Hello Enrico, welcome to LLDB']);
-
+ substrs=['Hello Enrico, welcome to LLDB'])
+
self.expect("help welcome",
- substrs = ['Just a docstring for welcome_impl',
- 'A command that says hello to LLDB users'])
+ substrs=['Just a docstring for welcome_impl',
+ 'A command that says hello to LLDB users'])
self.expect("help",
- substrs = ['For more information run',
- 'welcome'])
+ substrs=['For more information run',
+ 'welcome'])
self.expect("help -a",
- substrs = ['For more information run',
- 'welcome'])
+ substrs=['For more information run',
+ 'welcome'])
self.expect("help -u", matching=False,
- substrs = ['For more information run'])
+ substrs=['For more information run'])
- self.runCmd("command script delete welcome");
+ self.runCmd("command script delete welcome")
self.expect('welcome Enrico', matching=False, error=True,
- substrs = ['Hello Enrico, welcome to LLDB']);
+ substrs=['Hello Enrico, welcome to LLDB'])
self.expect('targetname fail', error=True,
- substrs = ['a test for error in command'])
+ substrs=['a test for error in command'])
self.expect('command script list',
- substrs = ['targetname',
- 'For more information run'])
+ substrs=['targetname',
+ 'For more information run'])
self.expect("help targetname",
- substrs = ['Expects', '\'raw\'', 'input',
- 'help', 'raw-input'])
+ substrs=['Expects', '\'raw\'', 'input',
+ 'help', 'raw-input'])
self.expect("longwait",
- substrs = ['Done; if you saw the delays I am doing OK'])
+ substrs=['Done; if you saw the delays I am doing OK'])
self.runCmd("b main")
self.runCmd("run")
self.runCmd("mysto 3")
self.expect("frame variable array",
- substrs = ['[0] = 79630','[1] = 388785018','[2] = 0'])
+ substrs=['[0] = 79630', '[1] = 388785018', '[2] = 0'])
self.runCmd("mysto 3")
self.expect("frame variable array",
- substrs = ['[0] = 79630','[4] = 388785018','[5] = 0'])
+ substrs=['[0] = 79630', '[4] = 388785018', '[5] = 0'])
# we cannot use the stepover command to check for async execution mode since LLDB
# seems to get confused when events start to queue up
self.expect("tell_sync",
- substrs = ['running sync'])
+ substrs=['running sync'])
self.expect("tell_async",
- substrs = ['running async'])
+ substrs=['running async'])
self.expect("tell_curr",
- substrs = ['I am running sync'])
-
+ substrs=['I am running sync'])
+
# check that the execution context is passed in to commands that ask for it
- self.expect("takes_exe_ctx", substrs = ["a.out"])
+ self.expect("takes_exe_ctx", substrs=["a.out"])
# Test that a python command can redefine itself
self.expect('command script add -f foobar welcome -h "just some help"')
-
+
self.runCmd("command script clear")
# Test that re-defining an existing command works
- self.runCmd('command script add my_command --class welcome.WelcomeCommand')
- self.expect('my_command Blah', substrs = ['Hello Blah, welcome to LLDB'])
-
- self.runCmd('command script add my_command --class welcome.TargetnameCommand')
- self.expect('my_command', substrs = ['a.out'])
+ self.runCmd(
+ 'command script add my_command --class welcome.WelcomeCommand')
+ self.expect('my_command Blah', substrs=['Hello Blah, welcome to LLDB'])
+
+ self.runCmd(
+ 'command script add my_command --class welcome.TargetnameCommand')
+ self.expect('my_command', substrs=['a.out'])
self.runCmd("command script clear")
-
+
self.expect('command script list', matching=False,
- substrs = ['targetname',
- 'longwait'])
+ substrs=['targetname',
+ 'longwait'])
self.expect('command script add -f foobar frame', error=True,
- substrs = ['cannot add command'])
+ substrs=['cannot add command'])
# http://llvm.org/bugs/show_bug.cgi?id=11569
- # LLDBSwigPythonCallCommand crashes when a command script returns an object
+ # LLDBSwigPythonCallCommand crashes when a command script returns an
+ # object
self.runCmd('command script add -f bug11569 bug11569')
# This should not crash.
self.runCmd('bug11569', check=False)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py Tue Sep 6 15:57:50 2016
@@ -3,5 +3,4 @@ def bug11569(debugger, args, result, dic
http://llvm.org/bugs/show_bug.cgi?id=11569
LLDBSwigPythonCallCommand crashes when a command script returns an object.
"""
- return ["return", "a", "non-string", "should", "not", "crash", "LLDB"];
-
+ return ["return", "a", "non-string", "should", "not", "crash", "LLDB"]
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py Tue Sep 6 15:57:50 2016
@@ -3,13 +3,15 @@
from __future__ import print_function
-
-import os, sys, time
+import os
+import sys
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class ImportTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -47,29 +49,31 @@ class ImportTestCase(TestBase):
self.runCmd("command script import ./bar/bar.py --allow-reload")
self.expect("command script import ./nosuchfile.py",
- error=True, startstr='error: module importing failed')
+ error=True, startstr='error: module importing failed')
self.expect("command script import ./nosuchfolder/",
- error=True, startstr='error: module importing failed')
+ error=True, startstr='error: module importing failed')
self.expect("command script import ./foo/foo.py", error=False)
self.runCmd("command script import --allow-reload ./thepackage")
- self.expect("TPcommandA",substrs=["hello world A"])
- self.expect("TPcommandB",substrs=["hello world B"])
+ self.expect("TPcommandA", substrs=["hello world A"])
+ self.expect("TPcommandB", substrs=["hello world B"])
self.runCmd("script import dummymodule")
self.expect("command script import ./dummymodule.py", error=False)
- self.expect("command script import --allow-reload ./dummymodule.py", error=False)
+ self.expect(
+ "command script import --allow-reload ./dummymodule.py",
+ error=False)
self.runCmd("command script add -f foo.foo_function foocmd")
self.runCmd("command script add -f foobar.foo_function foobarcmd")
self.runCmd("command script add -f bar.bar_function barcmd")
self.expect("foocmd hello",
- substrs = ['foo says', 'hello'])
+ substrs=['foo says', 'hello'])
self.expect("foo2cmd hello",
- substrs = ['foo2 says', 'hello'])
+ substrs=['foo2 says', 'hello'])
self.expect("barcmd hello",
- substrs = ['barutil says', 'bar told me', 'hello'])
+ substrs=['barutil says', 'bar told me', 'hello'])
self.expect("barothercmd hello",
- substrs = ['barutil says', 'bar told me', 'hello'])
+ substrs=['barutil says', 'bar told me', 'hello'])
self.expect("foobarcmd hello",
- substrs = ['foobar says', 'hello'])
+ substrs=['foobar says', 'hello'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py Tue Sep 6 15:57:50 2016
@@ -1,12 +1,15 @@
from __future__ import print_function
+
def bar_function(debugger, args, result, dict):
- global UtilityModule
- print(UtilityModule.barutil_function("bar told me " + args), file=result)
- return None
+ global UtilityModule
+ print(UtilityModule.barutil_function("bar told me " + args), file=result)
+ return None
+
def __lldb_init_module(debugger, session_dict):
- global UtilityModule
- UtilityModule = __import__("barutil")
- debugger.HandleCommand("command script add -f bar.bar_function barothercmd")
- return None
\ No newline at end of file
+ global UtilityModule
+ UtilityModule = __import__("barutil")
+ debugger.HandleCommand(
+ "command script add -f bar.bar_function barothercmd")
+ return None
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py Tue Sep 6 15:57:50 2016
@@ -1,2 +1,2 @@
def barutil_function(x):
- return "barutil says: " + x
+ return "barutil says: " + x
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py Tue Sep 6 15:57:50 2016
@@ -1,2 +1,2 @@
def no_useful_code(foo):
- return foo
+ return foo
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py Tue Sep 6 15:57:50 2016
@@ -1,5 +1,6 @@
from __future__ import print_function
+
def foo_function(debugger, args, result, dict):
- print("foobar says " + args, file=result)
- return None
+ print("foobar says " + args, file=result)
+ return None
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py Tue Sep 6 15:57:50 2016
@@ -1,5 +1,6 @@
from __future__ import print_function
+
def foo_function(debugger, args, result, dict):
- print("foo says " + args, file=result)
- return None
+ print("foo says " + args, file=result)
+ return None
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py Tue Sep 6 15:57:50 2016
@@ -1,9 +1,11 @@
from __future__ import print_function
+
def foo2_function(debugger, args, result, dict):
- print("foo2 says " + args, file=result)
- return None
+ print("foo2 says " + args, file=result)
+ return None
+
def __lldb_init_module(debugger, session_dict):
- debugger.HandleCommand("command script add -f foo2.foo2_function foo2cmd")
- return None
\ No newline at end of file
+ debugger.HandleCommand("command script add -f foo2.foo2_function foo2cmd")
+ return None
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py Tue Sep 6 15:57:50 2016
@@ -3,13 +3,15 @@
from __future__ import print_function
-
-import os, sys, time
+import os
+import sys
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class Rdar12586188TestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -27,7 +29,11 @@ class Rdar12586188TestCase(TestBase):
def run_test(self):
"""Check that we handle an ImportError in a special way when command script importing files."""
- self.expect("command script import ./fail12586188.py --allow-reload",
- error=True, substrs = ['raise ImportError("I do not want to be imported")'])
- self.expect("command script import ./fail212586188.py --allow-reload",
- error=True, substrs = ['raise ValueError("I do not want to be imported")'])
+ self.expect(
+ "command script import ./fail12586188.py --allow-reload",
+ error=True,
+ substrs=['raise ImportError("I do not want to be imported")'])
+ self.expect(
+ "command script import ./fail212586188.py --allow-reload",
+ error=True,
+ substrs=['raise ValueError("I do not want to be imported")'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py Tue Sep 6 15:57:50 2016
@@ -1,4 +1,4 @@
def f(x):
- return x + 1
+ return x + 1
raise ImportError("I do not want to be imported")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py Tue Sep 6 15:57:50 2016
@@ -1,4 +1,4 @@
def f(x):
- return x + 1
+ return x + 1
raise ValueError("I do not want to be imported")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py Tue Sep 6 15:57:50 2016
@@ -1,6 +1,7 @@
import six
+
def command(debugger, command, result, internal_dict):
- result.PutCString(six.u("hello world A"))
- return None
+ result.PutCString(six.u("hello world A"))
+ return None
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py Tue Sep 6 15:57:50 2016
@@ -1,6 +1,7 @@
import six
+
def command(debugger, command, result, internal_dict):
- result.PutCString(six.u("hello world B"))
- return None
+ result.PutCString(six.u("hello world B"))
+ return None
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py Tue Sep 6 15:57:50 2016
@@ -3,6 +3,9 @@ from __future__ import absolute_import
from . import TPunitA
from . import TPunitB
-def __lldb_init_module(debugger,*args):
- debugger.HandleCommand("command script add -f thepackage.TPunitA.command TPcommandA")
- debugger.HandleCommand("command script add -f thepackage.TPunitB.command TPcommandB")
+
+def __lldb_init_module(debugger, *args):
+ debugger.HandleCommand(
+ "command script add -f thepackage.TPunitA.command TPcommandA")
+ debugger.HandleCommand(
+ "command script add -f thepackage.TPunitB.command TPcommandB")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py Tue Sep 6 15:57:50 2016
@@ -5,19 +5,21 @@ import sys
import os
import time
+
def StepOver(debugger, args, result, dict):
- """
- Step over a given number of times instead of only just once
- """
- arg_split = args.split(" ")
- print(type(arg_split))
- count = int(arg_split[0])
- for i in range(0,count):
- debugger.GetSelectedTarget().GetProcess().GetSelectedThread().StepOver(lldb.eOnlyThisThread)
- print("step<%d>"%i)
+ """
+ Step over a given number of times instead of only just once
+ """
+ arg_split = args.split(" ")
+ print(type(arg_split))
+ count = int(arg_split[0])
+ for i in range(0, count):
+ debugger.GetSelectedTarget().GetProcess(
+ ).GetSelectedThread().StepOver(lldb.eOnlyThisThread)
+ print("step<%d>" % i)
-def __lldb_init_module(debugger, session_dict):
- # by default, --synchronicity is set to synchronous
- debugger.HandleCommand("command script add -f mysto.StepOver mysto")
- return None
+def __lldb_init_module(debugger, session_dict):
+ # by default, --synchronicity is set to synchronous
+ debugger.HandleCommand("command script add -f mysto.StepOver mysto")
+ return None
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py Tue Sep 6 15:57:50 2016
@@ -1,18 +1,23 @@
from __future__ import print_function
-import lldb, sys
+import lldb
+import sys
+
class WelcomeCommand(object):
+
def __init__(self, debugger, session_dict):
pass
-
+
def get_short_help(self):
return "Just a docstring for welcome_impl\nA command that says hello to LLDB users"
-
+
def __call__(self, debugger, args, exe_ctx, result):
- print('Hello ' + args + ', welcome to LLDB', file=result);
- return None;
+ print('Hello ' + args + ', welcome to LLDB', file=result)
+ return None
+
class TargetnameCommand(object):
+
def __init__(self, debugger, session_dict):
pass
@@ -22,10 +27,11 @@ class TargetnameCommand(object):
print('Current target ' + file.GetFilename(), file=result)
if args == 'fail':
result.SetError('a test for error in command')
-
+
def get_flags(self):
return lldb.eCommandRequiresTarget
+
def print_wait_impl(debugger, args, result, dict):
result.SetImmediateOutputFile(sys.stdout)
print('Trying to do long task..', file=result)
@@ -35,12 +41,13 @@ def print_wait_impl(debugger, args, resu
time.sleep(1)
print('Done; if you saw the delays I am doing OK', file=result)
+
def check_for_synchro(debugger, args, result, dict):
- if debugger.GetAsync() == True:
+ if debugger.GetAsync():
print('I am running async', file=result)
if debugger.GetAsync() == False:
print('I am running sync', file=result)
+
def takes_exe_ctx(debugger, args, exe_ctx, result, dict):
print(str(exe_ctx.GetTarget()), file=result)
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/TestCommandScriptAlias.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/TestCommandScriptAlias.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/TestCommandScriptAlias.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/TestCommandScriptAlias.py Tue Sep 6 15:57:50 2016
@@ -5,18 +5,20 @@ Test lldb Python commands.
from __future__ import print_function
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
+
class CommandScriptAliasTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def test (self):
- self.pycmd_tests ()
+ def test(self):
+ self.pycmd_tests()
- def pycmd_tests (self):
+ def pycmd_tests(self):
self.runCmd("command script import tcsacmd.py")
self.runCmd("command script add -f tcsacmd.some_command_here attach")
@@ -32,6 +34,7 @@ class CommandScriptAliasTestCase(TestBas
if not self.TraceOn():
self.HideStdout()
- self.expect('attach a', substrs = ['Victory is mine']);
+ self.expect('attach a', substrs=['Victory is mine'])
self.runCmd("command script delete attach")
- self.runCmd('attach noprocessexistswiththisname', check=False) # this can't crash but we don't care whether the actual attach works
+ # this can't crash but we don't care whether the actual attach works
+ self.runCmd('attach noprocessexistswiththisname', check=False)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/tcsacmd.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/tcsacmd.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/tcsacmd.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_alias/tcsacmd.py Tue Sep 6 15:57:50 2016
@@ -1,11 +1,12 @@
from __future__ import print_function
-import lldb, sys
+import lldb
+import sys
-def some_command_here(debugger, command, result, d):
- if command == "a":
- print("Victory is mine", file=result)
- return True
- else:
- print("Sadness for all", file=result)
- return False
+def some_command_here(debugger, command, result, d):
+ if command == "a":
+ print("Victory is mine", file=result)
+ return True
+ else:
+ print("Sadness for all", file=result)
+ return False
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test that LLDB correctly allows scripted
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test.lldbpexpect import *
from lldbsuite.test import lldbutil
+
class CommandScriptImmediateOutputTestCase (PExpectTest):
mydir = TestBase.compute_mydir(__file__)
@@ -22,10 +23,12 @@ class CommandScriptImmediateOutputTestCa
# Call super's setUp().
PExpectTest.setUp(self)
- @skipIfRemote # test not remote-ready llvm.org/pr24813
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+ @skipIfRemote # test not remote-ready llvm.org/pr24813
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
@expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr26139")
- def test_command_script_immediate_output_console (self):
+ def test_command_script_immediate_output_console(self):
"""Test that LLDB correctly allows scripted commands to set immediate output to the console."""
self.launch(timeout=10)
@@ -33,27 +36,33 @@ class CommandScriptImmediateOutputTestCa
prompt = "\(lldb\) "
self.sendline('command script import %s' % script, patterns=[prompt])
- self.sendline('command script add -f custom_command.command_function mycommand', patterns=[prompt])
- self.sendline('mycommand', patterns='this is a test string, just a test string')
+ self.sendline(
+ 'command script add -f custom_command.command_function mycommand',
+ patterns=[prompt])
+ self.sendline(
+ 'mycommand',
+ patterns='this is a test string, just a test string')
self.sendline('command script delete mycommand', patterns=[prompt])
self.quit(gracefully=False)
- @skipIfRemote # test not remote-ready llvm.org/pr24813
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+ @skipIfRemote # test not remote-ready llvm.org/pr24813
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
@expectedFailureAll(oslist=["freebsd"], bugnumber="llvm.org/pr26139")
- def test_command_script_immediate_output_file (self):
+ def test_command_script_immediate_output_file(self):
"""Test that LLDB correctly allows scripted commands to set immediate output to a file."""
self.launch(timeout=10)
- test_files = {os.path.join(os.getcwd(), 'read.txt') :'r',
- os.path.join(os.getcwd(), 'write.txt') :'w',
- os.path.join(os.getcwd(), 'append.txt') :'a',
- os.path.join(os.getcwd(), 'write_plus.txt') :'w+',
- os.path.join(os.getcwd(), 'read_plus.txt') :'r+',
- os.path.join(os.getcwd(), 'append_plus.txt') :'a+'}
+ test_files = {os.path.join(os.getcwd(), 'read.txt'): 'r',
+ os.path.join(os.getcwd(), 'write.txt'): 'w',
+ os.path.join(os.getcwd(), 'append.txt'): 'a',
+ os.path.join(os.getcwd(), 'write_plus.txt'): 'w+',
+ os.path.join(os.getcwd(), 'read_plus.txt'): 'r+',
+ os.path.join(os.getcwd(), 'append_plus.txt'): 'a+'}
starter_string = 'Starter Garbage\n'
- write_string = 'writing to file with mode: '
+ write_string = 'writing to file with mode: '
for path, mode in test_files.iteritems():
with open(path, 'w+') as init:
@@ -64,7 +73,9 @@ class CommandScriptImmediateOutputTestCa
self.sendline('command script import %s' % script, patterns=[prompt])
- self.sendline('command script add -f custom_command.write_file mywrite', patterns=[prompt])
+ self.sendline(
+ 'command script add -f custom_command.write_file mywrite',
+ patterns=[prompt])
for path, mode in test_files.iteritems():
command = 'mywrite "' + path + '" ' + mode
@@ -79,8 +90,8 @@ class CommandScriptImmediateOutputTestCa
if mode in ['r', 'a', 'a+']:
self.assertEquals(result.readline(), starter_string)
if mode in ['w', 'w+', 'r+', 'a', 'a+']:
- self.assertEquals(result.readline(), write_string + mode + '\n')
+ self.assertEquals(
+ result.readline(), write_string + mode + '\n')
self.assertTrue(os.path.isfile(path))
os.remove(path)
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/custom_command.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/custom_command.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/custom_command.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/custom_command.py Tue Sep 6 15:57:50 2016
@@ -3,15 +3,17 @@ from __future__ import print_function
import sys
import shlex
+
def command_function(debugger, command, exe_ctx, result, internal_dict):
- result.SetImmediateOutputFile(sys.__stdout__)
- print('this is a test string, just a test string', file=result)
+ result.SetImmediateOutputFile(sys.__stdout__)
+ print('this is a test string, just a test string', file=result)
+
def write_file(debugger, command, exe_ctx, result, internal_dict):
- args = shlex.split(command)
- path = args[0]
- mode = args[1]
- with open(path, mode) as f:
- result.SetImmediateOutputFile(f)
- if not mode in ['r']:
- print('writing to file with mode: ' + mode, file=result)
+ args = shlex.split(command)
+ path = args[0]
+ mode = args[1]
+ with open(path, mode) as f:
+ result.SetImmediateOutputFile(f)
+ if not mode in ['r']:
+ print('writing to file with mode: ' + mode, file=result)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py Tue Sep 6 15:57:50 2016
@@ -7,13 +7,14 @@ See also http://llvm.org/viewvc/llvm-pro
from __future__ import print_function
-
-import os, sys
+import os
+import sys
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class CommandSourceTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -35,4 +36,4 @@ class CommandSourceTestCase(TestBase):
import datetime
self.expect(result.GetOutput(), "script my.date() runs successfully",
exe=False,
- substrs = [str(datetime.date.today())])
+ substrs=[str(datetime.date.today())])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/my.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/my.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/my.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_source/my.py Tue Sep 6 15:57:50 2016
@@ -1,5 +1,6 @@
from __future__ import print_function
+
def date():
import datetime
today = datetime.date.today()
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py Tue Sep 6 15:57:50 2016
@@ -5,7 +5,6 @@ Test the lldb command line completion me
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.decorators import *
@@ -13,6 +12,7 @@ from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbplatform
from lldbsuite.test import lldbutil
+
class CommandLineCompletionTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -27,29 +27,31 @@ class CommandLineCompletionTestCase(Test
pass
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_at(self):
"""Test that 'at' completes to 'attach '."""
self.complete_from_to('at', 'attach ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_de(self):
"""Test that 'de' completes to 'detach '."""
self.complete_from_to('de', 'detach ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_process_attach_dash_dash_con(self):
"""Test that 'process attach --con' completes to 'process attach --continue '."""
- self.complete_from_to('process attach --con', 'process attach --continue ')
+ self.complete_from_to(
+ 'process attach --con',
+ 'process attach --continue ')
# <rdar://problem/11052829>
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_infinite_loop_while_completing(self):
"""Test that 'process print hello\' completes to itself and does not infinite loop."""
@@ -57,147 +59,176 @@ class CommandLineCompletionTestCase(Test
turn_off_re_match=True)
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_co(self):
"""Test that 'watchpoint co' completes to 'watchpoint command '."""
self.complete_from_to('watchpoint co', 'watchpoint command ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_command_space(self):
"""Test that 'watchpoint command ' completes to ['Available completions:', 'add', 'delete', 'list']."""
- self.complete_from_to('watchpoint command ', ['Available completions:', 'add', 'delete', 'list'])
+ self.complete_from_to(
+ 'watchpoint command ', [
+ 'Available completions:', 'add', 'delete', 'list'])
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_command_a(self):
"""Test that 'watchpoint command a' completes to 'watchpoint command add '."""
- self.complete_from_to('watchpoint command a', 'watchpoint command add ')
+ self.complete_from_to(
+ 'watchpoint command a',
+ 'watchpoint command add ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_set_variable_dash_w(self):
"""Test that 'watchpoint set variable -w' completes to 'watchpoint set variable -w '."""
- self.complete_from_to('watchpoint set variable -w', 'watchpoint set variable -w ')
+ self.complete_from_to(
+ 'watchpoint set variable -w',
+ 'watchpoint set variable -w ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_set_variable_dash_w_space(self):
"""Test that 'watchpoint set variable -w ' completes to ['Available completions:', 'read', 'write', 'read_write']."""
- self.complete_from_to('watchpoint set variable -w ', ['Available completions:', 'read', 'write', 'read_write'])
+ self.complete_from_to('watchpoint set variable -w ',
+ ['Available completions:', 'read', 'write', 'read_write'])
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_set_ex(self):
"""Test that 'watchpoint set ex' completes to 'watchpoint set expression '."""
- self.complete_from_to('watchpoint set ex', 'watchpoint set expression ')
+ self.complete_from_to(
+ 'watchpoint set ex',
+ 'watchpoint set expression ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_set_var(self):
"""Test that 'watchpoint set var' completes to 'watchpoint set variable '."""
self.complete_from_to('watchpoint set var', 'watchpoint set variable ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_watchpoint_set_variable_dash_w_read_underbar(self):
"""Test that 'watchpoint set variable -w read_' completes to 'watchpoint set variable -w read_write'."""
- self.complete_from_to('watchpoint set variable -w read_', 'watchpoint set variable -w read_write')
+ self.complete_from_to(
+ 'watchpoint set variable -w read_',
+ 'watchpoint set variable -w read_write')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_help_fi(self):
"""Test that 'help fi' completes to ['Available completions:', 'file', 'finish']."""
- self.complete_from_to('help fi', ['Available completions:', 'file', 'finish'])
+ self.complete_from_to(
+ 'help fi', [
+ 'Available completions:', 'file', 'finish'])
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_help_watchpoint_s(self):
"""Test that 'help watchpoint s' completes to 'help watchpoint set '."""
self.complete_from_to('help watchpoint s', 'help watchpoint set ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_append_target_er(self):
"""Test that 'settings append target.er' completes to 'settings append target.error-path'."""
- self.complete_from_to('settings append target.er', 'settings append target.error-path')
+ self.complete_from_to(
+ 'settings append target.er',
+ 'settings append target.error-path')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_insert_after_target_en(self):
"""Test that 'settings insert-after target.env' completes to 'settings insert-after target.env-vars'."""
- self.complete_from_to('settings insert-after target.env', 'settings insert-after target.env-vars')
+ self.complete_from_to(
+ 'settings insert-after target.env',
+ 'settings insert-after target.env-vars')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_insert_before_target_en(self):
"""Test that 'settings insert-before target.env' completes to 'settings insert-before target.env-vars'."""
- self.complete_from_to('settings insert-before target.env', 'settings insert-before target.env-vars')
+ self.complete_from_to(
+ 'settings insert-before target.env',
+ 'settings insert-before target.env-vars')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_replace_target_ru(self):
"""Test that 'settings replace target.ru' completes to 'settings replace target.run-args'."""
- self.complete_from_to('settings replace target.ru', 'settings replace target.run-args')
+ self.complete_from_to(
+ 'settings replace target.ru',
+ 'settings replace target.run-args')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_s(self):
"""Test that 'settings s' completes to ['Available completions:', 'set', 'show']."""
- self.complete_from_to('settings s', ['Available completions:', 'set', 'show'])
+ self.complete_from_to(
+ 'settings s', [
+ 'Available completions:', 'set', 'show'])
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_set_th(self):
"""Test that 'settings set th' completes to 'settings set thread-format'."""
self.complete_from_to('settings set th', 'settings set thread-format')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_s_dash(self):
"""Test that 'settings set -' completes to 'settings set -g'."""
self.complete_from_to('settings set -', 'settings set -g')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_clear_th(self):
"""Test that 'settings clear th' completes to 'settings clear thread-format'."""
- self.complete_from_to('settings clear th', 'settings clear thread-format')
+ self.complete_from_to(
+ 'settings clear th',
+ 'settings clear thread-format')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_set_ta(self):
"""Test that 'settings set ta' completes to 'settings set target.'."""
- self.complete_from_to('settings set target.ma', 'settings set target.max-')
+ self.complete_from_to(
+ 'settings set target.ma',
+ 'settings set target.max-')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_set_target_exec(self):
"""Test that 'settings set target.exec' completes to 'settings set target.exec-search-paths '."""
- self.complete_from_to('settings set target.exec', 'settings set target.exec-search-paths')
+ self.complete_from_to(
+ 'settings set target.exec',
+ 'settings set target.exec-search-paths')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_set_target_pr(self):
"""Test that 'settings set target.pr' completes to ['Available completions:',
@@ -208,21 +239,25 @@ class CommandLineCompletionTestCase(Test
'target.process.'])
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_set_target_process(self):
"""Test that 'settings set target.process' completes to 'settings set target.process.'."""
- self.complete_from_to('settings set target.process', 'settings set target.process.')
+ self.complete_from_to(
+ 'settings set target.process',
+ 'settings set target.process.')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_set_target_process_dot(self):
"""Test that 'settings set target.process.t' completes to 'settings set target.process.thread.'."""
- self.complete_from_to('settings set target.process.t', 'settings set target.process.thread.')
+ self.complete_from_to(
+ 'settings set target.process.t',
+ 'settings set target.process.thread.')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_settings_set_target_process_thread_dot(self):
"""Test that 'settings set target.process.thread.' completes to ['Available completions:',
@@ -233,31 +268,39 @@ class CommandLineCompletionTestCase(Test
'target.process.thread.trace-thread'])
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_target_space(self):
"""Test that 'target ' completes to ['Available completions:', 'create', 'delete', 'list',
'modules', 'select', 'stop-hook', 'variable']."""
self.complete_from_to('target ',
- ['Available completions:', 'create', 'delete', 'list',
- 'modules', 'select', 'stop-hook', 'variable'])
+ ['Available completions:',
+ 'create',
+ 'delete',
+ 'list',
+ 'modules',
+ 'select',
+ 'stop-hook',
+ 'variable'])
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_target_create_dash_co(self):
"""Test that 'target create --co' completes to 'target variable --core '."""
self.complete_from_to('target create --co', 'target create --core ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @skipIfFreeBSD # timing out on the FreeBSD buildbot
+ @skipIfFreeBSD # timing out on the FreeBSD buildbot
@no_debug_info_test
def test_target_va(self):
"""Test that 'target va' completes to 'target variable '."""
self.complete_from_to('target va', 'target variable ')
@expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr24679")
- @expectedFailureAll(oslist=lldbplatform.darwin_all, bugnumber="llvm.org/pr25485")
+ @expectedFailureAll(
+ oslist=lldbplatform.darwin_all,
+ bugnumber="llvm.org/pr25485")
def test_symbol_name(self):
self.build()
self.complete_from_to('''file a.out
@@ -277,7 +320,7 @@ class CommandLineCompletionTestCase(Test
# later on.
if not isinstance(patterns, list):
patterns = [patterns]
-
+
# The default lldb prompt.
prompt = "(lldb) "
@@ -304,7 +347,7 @@ class CommandLineCompletionTestCase(Test
# stop further logging.
child.logfile_send = None
child.logfile_read = None
-
+
with open('child_send.txt', 'r') as fs:
if self.TraceOn():
print("\n\nContents of child_send.txt:")
@@ -318,10 +361,13 @@ class CommandLineCompletionTestCase(Test
# The matching could be verbatim or using generic re pattern.
for p in patterns:
# Test that str_input completes to our patterns or substrings.
- # If each pattern/substring matches from_child, the completion mechanism works!
+ # If each pattern/substring matches from_child, the completion
+ # mechanism works!
if turn_off_re_match:
- self.expect(from_child, msg=COMPLETION_MSG(str_input, p), exe=False,
- substrs = [p])
+ self.expect(
+ from_child, msg=COMPLETION_MSG(
+ str_input, p), exe=False, substrs=[p])
else:
- self.expect(from_child, msg=COMPLETION_MSG(str_input, p), exe=False,
- patterns = [p])
+ self.expect(
+ from_child, msg=COMPLETION_MSG(
+ str_input, p), exe=False, patterns=[p])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py Tue Sep 6 15:57:50 2016
@@ -5,8 +5,8 @@ Test conditionally break on a function a
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
@@ -18,6 +18,7 @@ from lldbsuite.test import lldbutil
#
# This class currently fails for clang as well as llvm-gcc.
+
class ConditionalBreakTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -33,7 +34,9 @@ class ConditionalBreakTestCase(TestBase)
self.build()
self.simulate_conditional_break_by_user()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr26265: args in frames other than #0 are not evaluated correctly")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr26265: args in frames other than #0 are not evaluated correctly")
def do_conditional_break(self):
"""Exercise some thread and frame APIs to break if c() is called by a()."""
exe = os.path.join(os.getcwd(), "a.out")
@@ -45,7 +48,8 @@ class ConditionalBreakTestCase(TestBase)
self.assertTrue(breakpoint, VALID_BREAKPOINT)
# Now launch the process, and do not stop at entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
@@ -54,7 +58,8 @@ class ConditionalBreakTestCase(TestBase)
STOPPED_DUE_TO_BREAKPOINT)
# Find the line number where a's parent frame function is c.
- line = line_number('main.c',
+ line = line_number(
+ 'main.c',
"// Find the line number where c's parent frame is a here.")
# Suppose we are only interested in the call scenario where c()'s
@@ -66,15 +71,17 @@ class ConditionalBreakTestCase(TestBase)
for j in range(10):
if self.TraceOn():
print("j is: ", j)
- thread = lldbutil.get_one_thread_stopped_at_breakpoint(process, breakpoint)
- self.assertIsNotNone(thread, "Expected one thread to be stopped at the breakpoint")
-
+ thread = lldbutil.get_one_thread_stopped_at_breakpoint(
+ process, breakpoint)
+ self.assertIsNotNone(
+ thread, "Expected one thread to be stopped at the breakpoint")
+
if thread.GetNumFrames() >= 2:
frame0 = thread.GetFrameAtIndex(0)
name0 = frame0.GetFunction().GetName()
frame1 = thread.GetFrameAtIndex(1)
name1 = frame1.GetFunction().GetName()
- #lldbutil.print_stacktrace(thread)
+ # lldbutil.print_stacktrace(thread)
self.assertTrue(name0 == "c", "Break on function c()")
if (name1 == "a"):
# By design, we know that a() calls c() only from main.c:27.
@@ -83,7 +90,8 @@ class ConditionalBreakTestCase(TestBase)
self.assertTrue(frame1.GetLineEntry().GetLine() == line,
"Immediate caller a() at main.c:%d" % line)
- # And the local variable 'val' should have a value of (int) 3.
+ # And the local variable 'val' should have a value of (int)
+ # 3.
val = frame1.FindVariable("val")
self.assertEqual("int", val.GetTypeName())
self.assertEqual("3", val.GetValue())
@@ -109,28 +117,28 @@ class ConditionalBreakTestCase(TestBase)
self.runCmd("file a.out")
self.runCmd("command source .lldb")
- self.runCmd ("break list")
+ self.runCmd("break list")
if self.TraceOn():
print("About to run.")
self.runCmd("run", RUN_SUCCEEDED)
- self.runCmd ("break list")
+ self.runCmd("break list")
if self.TraceOn():
print("Done running")
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
# The frame info for frame #0 points to a.out`c and its immediate caller
# (frame #1) points to a.out`a.
self.expect("frame info", "We should stop at c()",
- substrs = ["a.out`c"])
+ substrs=["a.out`c"])
# Select our parent frame as the current frame.
self.runCmd("frame select 1")
self.expect("frame info", "The immediate caller should be a()",
- substrs = ["a.out`a"])
+ substrs=["a.out`a"])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py Tue Sep 6 15:57:50 2016
@@ -1,6 +1,7 @@
import sys
import lldb
+
def stop_if_called_from_a(frame, bp_loc, dict):
thread = frame.GetThread()
@@ -19,12 +20,11 @@ def stop_if_called_from_a(frame, bp_loc,
should_stop = True
if thread.GetNumFrames() >= 2:
- if (thread.frames[0].function.name == 'c' and thread.frames[1].function.name == 'a'):
+ if (thread.frames[0].function.name ==
+ 'c' and thread.frames[1].function.name == 'a'):
should_stop = True
else:
should_stop = False
dbg.SetAsync(old_async)
return should_stop
-
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/TestDarwinLogFilterMatchActivityChain.py Tue Sep 6 15:57:50 2016
@@ -60,28 +60,31 @@ class TestDarwinLogFilterMatchActivityCh
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_chain_partial_match(self):
"""Test that fall-through reject, doesn't accept only partial match of activity-chain."""
self.do_test(
["--no-match-accepts false",
- "--filter \"accept activity-chain match parent-activity:child-activity\"", # Match the second fully.
+ # Match the second fully.
+ "--filter \"accept activity-chain match parent-activity:child-activity\"",
"--filter \"accept activity-chain match parent-ac\""]) # Only partially match the first.
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_chain_full_match(self):
@@ -93,11 +96,12 @@ class TestDarwinLogFilterMatchActivityCh
# We should only see the second log message as we rejected the first
# via activity-chain rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_activity_chain_second_rule(self):
@@ -111,7 +115,9 @@ class TestDarwinLogFilterMatchActivityCh
# the first filter doesn't match any, and the second filter matches
# the activity-chain of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/TestDarwinLogFilterMatchActivity.py Tue Sep 6 15:57:50 2016
@@ -60,29 +60,32 @@ class TestDarwinLogFilterMatchActivity(d
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_partial_match(self):
"""Test that fall-through reject, accept match activity via partial match does not accept."""
self.do_test(
["--no-match-accepts false",
- "--filter \"accept activity match child-activity\"", # Fully match second message.
+ # Fully match second message.
+ "--filter \"accept activity match child-activity\"",
"--filter \"accept activity match parent-\""] # Only partially match first message.
)
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_full_match(self):
@@ -95,11 +98,12 @@ class TestDarwinLogFilterMatchActivity(d
# We should only see the second log message as we rejected the first
# via activity rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_activity_second_rule(self):
@@ -115,7 +119,9 @@ class TestDarwinLogFilterMatchActivity(d
# the first filter doesn't match any, and the second filter matches
# the activity of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/TestDarwinLogFilterMatchCategory.py Tue Sep 6 15:57:50 2016
@@ -60,27 +60,32 @@ class TestDarwinLogFilterMatchCategory(d
# We should only see the second log message as we only accept
# that category.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_category_partial_match(self):
"""Test that fall-through reject, accept regex category via partial match works."""
self.do_test(
["--no-match-accepts false",
- "--filter \"accept category match cat2\"", # Fully match the second message.
+ # Fully match the second message.
+ "--filter \"accept category match cat2\"",
"--filter \"accept category match at1\""] # Only partially match first message. Should not show up.
)
# We should only see the second log message as we only accept
# that category.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_category_full_match(self):
@@ -93,10 +98,12 @@ class TestDarwinLogFilterMatchCategory(d
# We should only see the second log message as we rejected the first
# via category rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_category_second_rule(self):
@@ -112,7 +119,9 @@ class TestDarwinLogFilterMatchCategory(d
# the first filter doesn't match any, and the second filter matches
# the category of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/TestDarwinLogFilterMatchMessage.py Tue Sep 6 15:57:50 2016
@@ -40,7 +40,6 @@ class TestDarwinLogFilterMatchMessage(da
# Turn on process monitor logging while we work out issues.
self.enable_process_monitor_logging = True
-
def tearDown(self):
# Shut down the process if it's still running.
if self.child:
@@ -58,7 +57,7 @@ class TestDarwinLogFilterMatchMessage(da
EXPECT_REGEXES = [
re.compile(r"log message ([^-]+)-(\S+)"),
re.compile(r"exited with status")
- ]
+ ]
@decorators.skipUnlessDarwin
def test_filter_accept_message_full_match(self):
@@ -72,10 +71,12 @@ class TestDarwinLogFilterMatchMessage(da
# We should only see the second log message as we only accept
# that message contents.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_no_accept_message_partial_match(self):
@@ -90,10 +91,12 @@ class TestDarwinLogFilterMatchMessage(da
# We should only see the second log message as the partial match on
# the first message should not pass.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_category_full_match(self):
@@ -107,10 +110,12 @@ class TestDarwinLogFilterMatchMessage(da
# We should only see the second log message as we rejected the first
# via message contents rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_category_second_rule(self):
@@ -126,7 +131,9 @@ class TestDarwinLogFilterMatchMessage(da
# the first filter doesn't match any, and the second filter matches
# the category of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/TestDarwinLogFilterMatchSubsystem.py Tue Sep 6 15:57:50 2016
@@ -60,27 +60,32 @@ class TestDarwinLogFilterMatchSubsystem(
# We should only see the second log message as we only accept
# that subsystem.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_subsystem_partial_match(self):
"""Test that fall-through reject, doesn't accept match subsystem via partial-match."""
self.do_test(
["--no-match-accepts false",
- "--filter \"accept subsystem match org.llvm.lldb.test.sub2\"", # Fully match second message subsystem.
+ # Fully match second message subsystem.
+ "--filter \"accept subsystem match org.llvm.lldb.test.sub2\"",
"--filter \"accept subsystem match sub1\""] # Only partially match first subsystem.
)
# We should only see the second log message as we only accept
# that subsystem.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_subsystem_full_match(self):
@@ -93,10 +98,12 @@ class TestDarwinLogFilterMatchSubsystem(
# We should only see the second log message as we rejected the first
# via subsystem rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_subsystem_second_rule(self):
@@ -112,7 +119,9 @@ class TestDarwinLogFilterMatchSubsystem(
# the first filter doesn't match any, and the second filter matches
# the subsystem of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/TestDarwinLogFilterRegexActivityChain.py Tue Sep 6 15:57:50 2016
@@ -60,11 +60,12 @@ class TestDarwinLogFilterRegexActivityCh
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_activity_chain_partial_match(self):
@@ -76,11 +77,12 @@ class TestDarwinLogFilterRegexActivityCh
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_chain_full_match(self):
@@ -92,11 +94,12 @@ class TestDarwinLogFilterRegexActivityCh
# We should only see the second log message as we rejected the first
# via activity-chain rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat1"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat1"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_chain_partial_match(self):
@@ -108,11 +111,12 @@ class TestDarwinLogFilterRegexActivityCh
# We should only see the second log message as we rejected the first
# via activity-chain rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_activity_chain_second_rule(self):
@@ -126,7 +130,9 @@ class TestDarwinLogFilterRegexActivityCh
# the first filter doesn't match any, and the second filter matches
# the activity-chain of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/TestDarwinLogFilterRegexActivity.py Tue Sep 6 15:57:50 2016
@@ -60,11 +60,12 @@ class TestDarwinLogFilterRegexActivity(d
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_activity_partial_match(self):
@@ -77,11 +78,12 @@ class TestDarwinLogFilterRegexActivity(d
# We should only see the second log message as we only accept
# that activity.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_full_match(self):
@@ -94,11 +96,12 @@ class TestDarwinLogFilterRegexActivity(d
# We should only see the second log message as we rejected the first
# via activity rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_activity_partial_match(self):
@@ -111,11 +114,12 @@ class TestDarwinLogFilterRegexActivity(d
# We should only see the second log message as we rejected the first
# via activity rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
-
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_activity_second_rule(self):
@@ -131,7 +135,9 @@ class TestDarwinLogFilterRegexActivity(d
# the first filter doesn't match any, and the second filter matches
# the activity of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/TestDarwinLogFilterRegexCategory.py Tue Sep 6 15:57:50 2016
@@ -60,10 +60,12 @@ class TestDarwinLogFilterRegexCategory(d
# We should only see the second log message as we only accept
# that category.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_category_partial_match(self):
@@ -76,10 +78,12 @@ class TestDarwinLogFilterRegexCategory(d
# We should only see the second log message as we only accept
# that category.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_category_full_match(self):
@@ -92,10 +96,12 @@ class TestDarwinLogFilterRegexCategory(d
# We should only see the second log message as we rejected the first
# via category rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_category_partial_match(self):
@@ -108,10 +114,12 @@ class TestDarwinLogFilterRegexCategory(d
# We should only see the second log message as we rejected the first
# via category rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_category_second_rule(self):
@@ -127,7 +135,9 @@ class TestDarwinLogFilterRegexCategory(d
# the first filter doesn't match any, and the second filter matches
# the category of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/TestDarwinLogFilterRegexSubsystem.py Tue Sep 6 15:57:50 2016
@@ -77,10 +77,12 @@ class TestDarwinLogFilterRegexSubsystem(
# We should only see the second log message as we only accept
# that subsystem.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_subsystem_partial_match(self):
@@ -93,10 +95,12 @@ class TestDarwinLogFilterRegexSubsystem(
# We should only see the second log message as we only accept
# that subsystem.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_subsystem_full_match(self):
@@ -109,10 +113,12 @@ class TestDarwinLogFilterRegexSubsystem(
# We should only see the second log message as we rejected the first
# via subsystem rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_reject_subsystem_partial_match(self):
@@ -125,10 +131,12 @@ class TestDarwinLogFilterRegexSubsystem(
# We should only see the second log message as we rejected the first
# via subsystem rejection.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_filter_accept_subsystem_second_rule(self):
@@ -144,7 +152,9 @@ class TestDarwinLogFilterRegexSubsystem(
# the first filter doesn't match any, and the second filter matches
# the subsystem of the second log message.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) == "sub2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 0) and (
+ self.child.match.group(1) == "sub2"),
+ "first log line should not be present, second log line "
+ "should be")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/format/TestDarwinLogMessageFormat.py Tue Sep 6 15:57:50 2016
@@ -64,9 +64,8 @@ class TestDarwinLogMessageFormat(darwin_
# content.
self.assertIsNotNone(self.child.match)
self.assertFalse((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) != ""),
- "we should not have seen a header")
-
+ (self.child.match.group(1) != ""),
+ "we should not have seen a header")
@decorators.skipUnlessDarwin
def test_display_with_header_works(self):
@@ -83,8 +82,8 @@ class TestDarwinLogMessageFormat(darwin_
# content.
self.assertIsNotNone(self.child.match)
self.assertTrue((len(self.child.match.groups()) > 0) and
- (self.child.match.group(1) != ""),
- "we should have printed a header")
+ (self.child.match.group(1) != ""),
+ "we should have printed a header")
def assert_header_contains_timestamp(self, header):
fields = header.split(',')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/TestDarwinLogSourceDebug.py Tue Sep 6 15:57:50 2016
@@ -60,10 +60,12 @@ class TestDarwinLogSourceDebug(darwin_lo
# We should only see the second log message as the first is a
# debug-level message and we're not including debug-level messages.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_source_explicitly_include_debug(self):
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/TestDarwinLogSourceInfo.py Tue Sep 6 15:57:50 2016
@@ -61,10 +61,12 @@ class TestDarwinLogSourceInfo(darwin_log
# We should only see the second log message as the first is an
# info-level message and we're not including debug-level messages.
self.assertIsNotNone(self.child.match)
- self.assertTrue((len(self.child.match.groups()) > 1) and
- (self.child.match.group(2) == "cat2"),
- "first log line should not be present, second log line "
- "should be")
+ self.assertTrue(
+ (len(
+ self.child.match.groups()) > 1) and (
+ self.child.match.group(2) == "cat2"),
+ "first log line should not be present, second log line "
+ "should be")
@decorators.skipUnlessDarwin
def test_source_include_info_level(self):
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DataFormatterBoolRefPtr(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -33,14 +34,15 @@ class DataFormatterBoolRefPtr(TestBase):
"""Test the formatters we use for BOOL& and BOOL* in Objective-C."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.mm", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.mm", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -56,23 +58,24 @@ class DataFormatterBoolRefPtr(TestBase):
# Now check that we use the right summary for BOOL&
self.expect('frame variable yes_ref',
- substrs = ['YES'])
+ substrs=['YES'])
self.expect('frame variable no_ref',
- substrs = ['NO'])
- if not(isiOS): self.expect('frame variable unset_ref', substrs = ['12'])
-
+ substrs=['NO'])
+ if not(isiOS):
+ self.expect('frame variable unset_ref', substrs=['12'])
# Now check that we use the right summary for BOOL*
self.expect('frame variable yes_ptr',
- substrs = ['YES'])
+ substrs=['YES'])
self.expect('frame variable no_ptr',
- substrs = ['NO'])
- if not(isiOS): self.expect('frame variable unset_ptr', substrs = ['12'])
-
+ substrs=['NO'])
+ if not(isiOS):
+ self.expect('frame variable unset_ptr', substrs=['12'])
# Now check that we use the right summary for BOOL
self.expect('frame variable yes',
- substrs = ['YES'])
+ substrs=['YES'])
self.expect('frame variable no',
- substrs = ['NO'])
- if not(isiOS): self.expect('frame variable unset', substrs = ['12'])
+ substrs=['NO'])
+ if not(isiOS):
+ self.expect('frame variable unset', substrs=['12'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class CompactVectorsFormattingTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -28,14 +29,15 @@ class CompactVectorsFormattingTestCase(T
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -45,15 +47,17 @@ class CompactVectorsFormattingTestCase(T
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
- self.expect('frame variable',
- substrs = ['(vFloat) valueFL = (1.25, 0, 0.25, 0)',
- '(int16_t [8]) valueI16 = (1, 0, 4, 0, 0, 1, 0, 4)',
- '(int32_t [4]) valueI32 = (1, 0, 4, 0)',
- '(vDouble) valueDL = (1.25, 2.25)',
- '(vUInt8) valueU8 = (0x01, 0x00, 0x04, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)',
- '(vUInt16) valueU16 = (1, 0, 4, 0, 0, 1, 0, 4)',
- '(vUInt32) valueU32 = (1, 2, 3, 4)',
- "(vSInt8) valueS8 = (1, 0, 4, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0)",
- '(vSInt16) valueS16 = (1, 0, 4, 0, 0, 1, 0, 4)',
- '(vSInt32) valueS32 = (4, 3, 2, 1)',
- '(vBool32) valueBool32 = (0, 1, 0, 1)'])
+ self.expect(
+ 'frame variable',
+ substrs=[
+ '(vFloat) valueFL = (1.25, 0, 0.25, 0)',
+ '(int16_t [8]) valueI16 = (1, 0, 4, 0, 0, 1, 0, 4)',
+ '(int32_t [4]) valueI32 = (1, 0, 4, 0)',
+ '(vDouble) valueDL = (1.25, 2.25)',
+ '(vUInt8) valueU8 = (0x01, 0x00, 0x04, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)',
+ '(vUInt16) valueU16 = (1, 0, 4, 0, 0, 1, 0, 4)',
+ '(vUInt32) valueU32 = (1, 2, 3, 4)',
+ "(vSInt8) valueS8 = (1, 0, 4, 0, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0)",
+ '(vSInt16) valueS16 = (1, 0, 4, 0, 0, 1, 0, 4)',
+ '(vSInt32) valueS32 = (4, 3, 2, 1)',
+ '(vBool32) valueBool32 = (0, 1, 0, 1)'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class AdvDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,103 +27,116 @@ class AdvDataFormatterTestCase(TestBase)
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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("settings set target.max-children-count 256", 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.runCmd("type summary add --summary-string \"pippo\" \"i_am_cool\"")
- self.runCmd("type summary add --summary-string \"pluto\" -x \"i_am_cool[a-z]*\"")
+ self.runCmd(
+ "type summary add --summary-string \"pluto\" -x \"i_am_cool[a-z]*\"")
self.expect("frame variable cool_boy",
- substrs = ['pippo'])
+ substrs=['pippo'])
self.expect("frame variable cooler_boy",
- substrs = ['pluto'])
+ substrs=['pluto'])
self.runCmd("type summary delete i_am_cool")
-
+
self.expect("frame variable cool_boy",
- substrs = ['pluto'])
+ substrs=['pluto'])
self.runCmd("type summary clear")
-
- self.runCmd("type summary add --summary-string \"${var[]}\" -x \"int \\[[0-9]\\]")
+
+ self.runCmd(
+ "type summary add --summary-string \"${var[]}\" -x \"int \\[[0-9]\\]")
self.expect("frame variable int_array",
- substrs = ['1,2,3,4,5'])
+ substrs=['1,2,3,4,5'])
# this will fail if we don't do [] as regex correctly
- self.runCmd('type summary add --summary-string "${var[].integer}" "i_am_cool[]')
-
+ self.runCmd(
+ 'type summary add --summary-string "${var[].integer}" "i_am_cool[]')
+
self.expect("frame variable cool_array",
- substrs = ['1,1,1,1,6'])
+ substrs=['1,1,1,1,6'])
self.runCmd("type summary clear")
-
- self.runCmd("type summary add --summary-string \"${var[1-0]%x}\" \"int\"")
-
+
+ self.runCmd(
+ "type summary add --summary-string \"${var[1-0]%x}\" \"int\"")
+
self.expect("frame variable iAmInt",
- substrs = ['01'])
-
- self.runCmd("type summary add --summary-string \"${var[0-1]%x}\" \"int\"")
-
+ substrs=['01'])
+
+ self.runCmd(
+ "type summary add --summary-string \"${var[0-1]%x}\" \"int\"")
+
self.expect("frame variable iAmInt",
- substrs = ['01'])
+ substrs=['01'])
self.runCmd("type summary clear")
self.runCmd("type summary add --summary-string \"${var[0-1]%x}\" int")
- self.runCmd("type summary add --summary-string \"${var[0-31]%x}\" float")
-
+ self.runCmd(
+ "type summary add --summary-string \"${var[0-31]%x}\" float")
+
self.expect("frame variable *pointer",
- substrs = ['0x',
- '2'])
+ substrs=['0x',
+ '2'])
- # check fix for <rdar://problem/11338654> LLDB crashes when using a "type summary" that uses bitfields with no format
+ # check fix for <rdar://problem/11338654> LLDB crashes when using a
+ # "type summary" that uses bitfields with no format
self.runCmd("type summary add --summary-string \"${var[0-1]}\" int")
self.expect("frame variable iAmInt",
- substrs = ['9 1'])
+ substrs=['9 1'])
self.expect("frame variable cool_array[3].floating",
- substrs = ['0x'])
-
- self.runCmd("type summary add --summary-string \"low bits are ${*var[0-1]} tgt is ${*var}\" \"int *\"")
+ substrs=['0x'])
+
+ self.runCmd(
+ "type summary add --summary-string \"low bits are ${*var[0-1]} tgt is ${*var}\" \"int *\"")
self.expect("frame variable pointer",
- substrs = ['low bits are',
- 'tgt is 6'])
+ substrs=['low bits are',
+ 'tgt is 6'])
- self.expect("frame variable int_array --summary-string \"${*var[0-1]}\"",
- substrs = ['3'])
+ self.expect(
+ "frame variable int_array --summary-string \"${*var[0-1]}\"",
+ substrs=['3'])
self.runCmd("type summary clear")
-
- self.runCmd('type summary add --summary-string \"${var[0-1]}\" -x \"int \[[0-9]\]\"')
+
+ self.runCmd(
+ 'type summary add --summary-string \"${var[0-1]}\" -x \"int \[[0-9]\]\"')
self.expect("frame variable int_array",
- substrs = ['1,2'])
+ substrs=['1,2'])
- self.runCmd('type summary add --summary-string \"${var[0-1]}\" "int []"')
+ self.runCmd(
+ 'type summary add --summary-string \"${var[0-1]}\" "int []"')
self.expect("frame variable int_array",
- substrs = ['1,2'])
+ substrs=['1,2'])
self.runCmd("type summary clear")
@@ -130,156 +144,179 @@ class AdvDataFormatterTestCase(TestBase)
self.runCmd("type summary add -c i_am_cool")
self.expect("frame variable cool_array",
- substrs = ['[0]',
- '[1]',
- '[2]',
- '[3]',
- '[4]',
- 'integer',
- 'character',
- 'floating'])
+ substrs=['[0]',
+ '[1]',
+ '[2]',
+ '[3]',
+ '[4]',
+ 'integer',
+ 'character',
+ 'floating'])
- self.runCmd("type summary add --summary-string \"int = ${*var.int_pointer}, float = ${*var.float_pointer}\" IWrapPointers")
+ self.runCmd(
+ "type summary add --summary-string \"int = ${*var.int_pointer}, float = ${*var.float_pointer}\" IWrapPointers")
self.expect("frame variable wrapper",
- substrs = ['int = 4',
- 'float = 1.1'])
+ substrs=['int = 4',
+ 'float = 1.1'])
+
+ self.runCmd(
+ "type summary add --summary-string \"low bits = ${*var.int_pointer[2]}\" IWrapPointers -p")
- self.runCmd("type summary add --summary-string \"low bits = ${*var.int_pointer[2]}\" IWrapPointers -p")
-
self.expect("frame variable wrapper",
- substrs = ['low bits = 1'])
-
+ substrs=['low bits = 1'])
+
self.expect("frame variable *wrap_pointer",
- substrs = ['low bits = 1'])
+ substrs=['low bits = 1'])
self.runCmd("type summary clear")
- self.expect("frame variable int_array --summary-string \"${var[0][0-2]%hex}\"",
- substrs = ['0x',
- '7'])
+ self.expect(
+ "frame variable int_array --summary-string \"${var[0][0-2]%hex}\"",
+ substrs=[
+ '0x',
+ '7'])
self.runCmd("type summary clear")
- self.runCmd("type summary add --summary-string \"${*var[].x[0-3]%hex} is a bitfield on a set of integers\" -x \"SimpleWithPointers \[[0-9]\]\"")
+ self.runCmd(
+ "type summary add --summary-string \"${*var[].x[0-3]%hex} is a bitfield on a set of integers\" -x \"SimpleWithPointers \[[0-9]\]\"")
- self.expect("frame variable couple --summary-string \"${*var.sp.x[0-2]} are low bits of integer ${*var.sp.x}. If I pretend it is an array I get ${var.sp.x[0-5]}\"",
- substrs = ['1 are low bits of integer 9.',
- 'If I pretend it is an array I get [9,'])
+ self.expect(
+ "frame variable couple --summary-string \"${*var.sp.x[0-2]} are low bits of integer ${*var.sp.x}. If I pretend it is an array I get ${var.sp.x[0-5]}\"",
+ substrs=[
+ '1 are low bits of integer 9.',
+ 'If I pretend it is an array I get [9,'])
# if the summary has an error, we still display the value
- self.expect("frame variable couple --summary-string \"${*var.sp.foo[0-2]\"",
- substrs = ['(Couple) couple = {','x = 0x','y = 0x','z = 0x','s = 0x'])
+ self.expect(
+ "frame variable couple --summary-string \"${*var.sp.foo[0-2]\"",
+ substrs=[
+ '(Couple) couple = {',
+ 'x = 0x',
+ 'y = 0x',
+ 'z = 0x',
+ 's = 0x'])
-
- self.runCmd("type summary add --summary-string \"${*var.sp.x[0-2]} are low bits of integer ${*var.sp.x}. If I pretend it is an array I get ${var.sp.x[0-5]}\" Couple")
+ self.runCmd(
+ "type summary add --summary-string \"${*var.sp.x[0-2]} are low bits of integer ${*var.sp.x}. If I pretend it is an array I get ${var.sp.x[0-5]}\" Couple")
self.expect("frame variable sparray",
- substrs = ['[0x0000000f,0x0000000c,0x00000009]'])
-
- # check that we can format a variable in a summary even if a format is defined for its datatype
+ substrs=['[0x0000000f,0x0000000c,0x00000009]'])
+
+ # check that we can format a variable in a summary even if a format is
+ # defined for its datatype
self.runCmd("type format add -f hex int")
- self.runCmd("type summary add --summary-string \"x=${var.x%d}\" Simple")
+ self.runCmd(
+ "type summary add --summary-string \"x=${var.x%d}\" Simple")
self.expect("frame variable a_simple_object",
- substrs = ['x=3'])
+ substrs=['x=3'])
self.expect("frame variable a_simple_object", matching=False,
- substrs = ['0x0'])
+ substrs=['0x0'])
# now check that the default is applied if we do not hand out a format
self.runCmd("type summary add --summary-string \"x=${var.x}\" Simple")
self.expect("frame variable a_simple_object", matching=False,
- substrs = ['x=3'])
+ substrs=['x=3'])
self.expect("frame variable a_simple_object", matching=True,
- substrs = ['x=0x00000003'])
+ substrs=['x=0x00000003'])
# check that we can correctly cap the number of children shown
self.runCmd("settings set target.max-children-count 5")
self.expect('frame variable a_long_guy', matching=True,
- substrs = ['a_1',
- 'b_1',
- 'c_1',
- 'd_1',
- 'e_1',
- '...'])
+ substrs=['a_1',
+ 'b_1',
+ 'c_1',
+ 'd_1',
+ 'e_1',
+ '...'])
# check that no further stuff is printed (not ALL values are checked!)
self.expect('frame variable a_long_guy', matching=False,
- substrs = ['f_1',
- 'g_1',
- 'h_1',
- 'i_1',
- 'j_1',
- 'q_1',
- 'a_2',
- 'f_2',
- 't_2',
- 'w_2'])
+ substrs=['f_1',
+ 'g_1',
+ 'h_1',
+ 'i_1',
+ 'j_1',
+ 'q_1',
+ 'a_2',
+ 'f_2',
+ 't_2',
+ 'w_2'])
self.runCmd("settings set target.max-children-count 1")
self.expect('frame variable a_long_guy', matching=True,
- substrs = ['a_1',
- '...'])
+ substrs=['a_1',
+ '...'])
self.expect('frame variable a_long_guy', matching=False,
- substrs = ['b_1',
- 'c_1',
- 'd_1',
- 'e_1'])
+ substrs=['b_1',
+ 'c_1',
+ 'd_1',
+ 'e_1'])
self.expect('frame variable a_long_guy', matching=False,
- substrs = ['f_1',
- 'g_1',
- 'h_1',
- 'i_1',
- 'j_1',
- 'q_1',
- 'a_2',
- 'f_2',
- 't_2',
- 'w_2'])
+ substrs=['f_1',
+ 'g_1',
+ 'h_1',
+ 'i_1',
+ 'j_1',
+ 'q_1',
+ 'a_2',
+ 'f_2',
+ 't_2',
+ 'w_2'])
self.runCmd("settings set target.max-children-count 30")
self.expect('frame variable a_long_guy', matching=True,
- substrs = ['a_1',
- 'b_1',
- 'c_1',
- 'd_1',
- 'e_1',
- 'z_1',
- 'a_2',
- 'b_2',
- 'c_2',
- 'd_2',
- '...'])
+ substrs=['a_1',
+ 'b_1',
+ 'c_1',
+ 'd_1',
+ 'e_1',
+ 'z_1',
+ 'a_2',
+ 'b_2',
+ 'c_2',
+ 'd_2',
+ '...'])
self.expect('frame variable a_long_guy', matching=False,
- substrs = ['e_2',
- 'n_2',
- 'r_2',
- 'i_2',
- 'k_2',
- 'o_2'])
-
- # override the cap
- self.expect('frame variable a_long_guy --show-all-children', matching=True,
- substrs = ['a_1',
- 'b_1',
- 'c_1',
- 'd_1',
- 'e_1',
- 'z_1',
- 'a_2',
- 'b_2',
- 'c_2',
- 'd_2'])
- self.expect('frame variable a_long_guy --show-all-children', matching=True,
- substrs = ['e_2',
- 'n_2',
- 'r_2',
- 'i_2',
- 'k_2',
- 'o_2'])
- self.expect('frame variable a_long_guy --show-all-children', matching=False,
- substrs = ['...'])
+ substrs=['e_2',
+ 'n_2',
+ 'r_2',
+ 'i_2',
+ 'k_2',
+ 'o_2'])
+
+ # override the cap
+ self.expect(
+ 'frame variable a_long_guy --show-all-children',
+ matching=True,
+ substrs=[
+ 'a_1',
+ 'b_1',
+ 'c_1',
+ 'd_1',
+ 'e_1',
+ 'z_1',
+ 'a_2',
+ 'b_2',
+ 'c_2',
+ 'd_2'])
+ self.expect(
+ 'frame variable a_long_guy --show-all-children',
+ matching=True,
+ substrs=[
+ 'e_2',
+ 'n_2',
+ 'r_2',
+ 'i_2',
+ 'k_2',
+ 'o_2'])
+ self.expect(
+ 'frame variable a_long_guy --show-all-children',
+ matching=False,
+ substrs=['...'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class CategoriesDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -27,14 +28,15 @@ class CategoriesDataFormatterTestCase(Te
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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 (most of these categories do not
@@ -46,286 +48,312 @@ class CategoriesDataFormatterTestCase(Te
self.runCmd('type category delete Category2', check=False)
self.runCmd('type category delete NewCategory', check=False)
self.runCmd("type category delete CircleCategory", check=False)
- self.runCmd("type category delete RectangleStarCategory", check=False)
+ self.runCmd(
+ "type category delete RectangleStarCategory",
+ check=False)
self.runCmd("type category delete BaseCategory", check=False)
-
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
# Add a summary to a new category and check that it works
- self.runCmd("type summary add Rectangle --summary-string \"ARectangle\" -w NewCategory")
+ self.runCmd(
+ "type summary add Rectangle --summary-string \"ARectangle\" -w NewCategory")
self.expect("frame variable r1 r2 r3", matching=False,
- substrs = ['r1 = ARectangle',
- 'r2 = ARectangle',
- 'r3 = ARectangle'])
-
+ substrs=['r1 = ARectangle',
+ 'r2 = ARectangle',
+ 'r3 = ARectangle'])
+
self.runCmd("type category enable NewCategory")
self.expect("frame variable r1 r2 r3", matching=True,
- substrs = ['r1 = ARectangle',
- 'r2 = ARectangle',
- 'r3 = ARectangle'])
-
+ substrs=['r1 = ARectangle',
+ 'r2 = ARectangle',
+ 'r3 = ARectangle'])
+
# Disable the category and check that the old stuff is there
self.runCmd("type category disable NewCategory")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = {',
- 'r2 = {',
- 'r3 = {'])
+ substrs=['r1 = {',
+ 'r2 = {',
+ 'r3 = {'])
# Re-enable the category and check that it works
self.runCmd("type category enable NewCategory")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = ARectangle',
- 'r2 = ARectangle',
- 'r3 = ARectangle'])
+ substrs=['r1 = ARectangle',
+ 'r2 = ARectangle',
+ 'r3 = ARectangle'])
# Delete the category and the old stuff should be there
self.runCmd("type category delete NewCategory")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = {',
- 'r2 = {',
- 'r3 = {'])
-
- # Add summaries to two different categories and check that we can switch
- self.runCmd("type summary add --summary-string \"Width = ${var.w}, Height = ${var.h}\" Rectangle -w Category1")
+ substrs=['r1 = {',
+ 'r2 = {',
+ 'r3 = {'])
+
+ # Add summaries to two different categories and check that we can
+ # switch
+ self.runCmd(
+ "type summary add --summary-string \"Width = ${var.w}, Height = ${var.h}\" Rectangle -w Category1")
self.runCmd("type summary add --python-script \"return 'Area = ' + str( int(valobj.GetChildMemberWithName('w').GetValue()) * int(valobj.GetChildMemberWithName('h').GetValue()) );\" Rectangle -w Category2")
# check that enable A B is the same as enable B enable A
self.runCmd("type category enable Category1 Category2")
-
+
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Width = ',
- 'r2 = Width = ',
- 'r3 = Width = '])
+ substrs=['r1 = Width = ',
+ 'r2 = Width = ',
+ 'r3 = Width = '])
self.runCmd("type category disable Category1")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Area = ',
- 'r2 = Area = ',
- 'r3 = Area = '])
+ substrs=['r1 = Area = ',
+ 'r2 = Area = ',
+ 'r3 = Area = '])
# switch again
self.runCmd("type category enable Category1")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Width = ',
- 'r2 = Width = ',
- 'r3 = Width = '])
+ substrs=['r1 = Width = ',
+ 'r2 = Width = ',
+ 'r3 = Width = '])
# Re-enable the category and show that the preference is persisted
self.runCmd("type category disable Category2")
self.runCmd("type category enable Category2")
-
+
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Area = ',
- 'r2 = Area = ',
- 'r3 = Area = '])
+ substrs=['r1 = Area = ',
+ 'r2 = Area = ',
+ 'r3 = Area = '])
# Now delete the favorite summary
self.runCmd("type summary delete Rectangle -w Category2")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Width = ',
- 'r2 = Width = ',
- 'r3 = Width = '])
+ substrs=['r1 = Width = ',
+ 'r2 = Width = ',
+ 'r3 = Width = '])
# Delete the summary from the default category (that does not have it)
self.runCmd("type summary delete Rectangle", check=False)
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Width = ',
- 'r2 = Width = ',
- 'r3 = Width = '])
+ substrs=['r1 = Width = ',
+ 'r2 = Width = ',
+ 'r3 = Width = '])
# Now add another summary to another category and switch back and forth
self.runCmd("type category delete Category1 Category2")
- self.runCmd("type summary add Rectangle -w Category1 --summary-string \"Category1\"")
- self.runCmd("type summary add Rectangle -w Category2 --summary-string \"Category2\"")
+ self.runCmd(
+ "type summary add Rectangle -w Category1 --summary-string \"Category1\"")
+ self.runCmd(
+ "type summary add Rectangle -w Category2 --summary-string \"Category2\"")
self.runCmd("type category enable Category2")
self.runCmd("type category enable Category1")
-
+
self.runCmd("type summary list -w Category1")
- self.expect("type summary list -w NoSuchCategoryHere", substrs=['no matching results found'])
-
+ self.expect("type summary list -w NoSuchCategoryHere",
+ substrs=['no matching results found'])
+
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Category1',
- 'r2 = Category1',
- 'r3 = Category1'])
+ substrs=['r1 = Category1',
+ 'r2 = Category1',
+ 'r3 = Category1'])
self.runCmd("type category disable Category1")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Category2',
- 'r2 = Category2',
- 'r3 = Category2'])
+ substrs=['r1 = Category2',
+ 'r2 = Category2',
+ 'r3 = Category2'])
# Check that re-enabling an enabled category works
self.runCmd("type category enable Category1")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Category1',
- 'r2 = Category1',
- 'r3 = Category1'])
+ substrs=['r1 = Category1',
+ 'r2 = Category1',
+ 'r3 = Category1'])
self.runCmd("type category delete Category1")
self.runCmd("type category delete Category2")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = {',
- 'r2 = {',
- 'r3 = {'])
-
- # Check that multiple summaries can go into one category
- self.runCmd("type summary add -w Category1 --summary-string \"Width = ${var.w}, Height = ${var.h}\" Rectangle")
- self.runCmd("type summary add -w Category1 --summary-string \"Radius = ${var.r}\" Circle")
-
+ substrs=['r1 = {',
+ 'r2 = {',
+ 'r3 = {'])
+
+ # Check that multiple summaries can go into one category
+ self.runCmd(
+ "type summary add -w Category1 --summary-string \"Width = ${var.w}, Height = ${var.h}\" Rectangle")
+ self.runCmd(
+ "type summary add -w Category1 --summary-string \"Radius = ${var.r}\" Circle")
+
self.runCmd("type category enable Category1")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Width = ',
- 'r2 = Width = ',
- 'r3 = Width = '])
+ substrs=['r1 = Width = ',
+ 'r2 = Width = ',
+ 'r3 = Width = '])
self.expect("frame variable c1 c2 c3",
- substrs = ['c1 = Radius = ',
- 'c2 = Radius = ',
- 'c3 = Radius = '])
+ substrs=['c1 = Radius = ',
+ 'c2 = Radius = ',
+ 'c3 = Radius = '])
self.runCmd("type summary delete Circle -w Category1")
-
+
self.expect("frame variable c1 c2 c3",
- substrs = ['c1 = {',
- 'c2 = {',
- 'c3 = {'])
+ substrs=['c1 = {',
+ 'c2 = {',
+ 'c3 = {'])
# Add a regex based summary to a category
- self.runCmd("type summary add -w Category1 --summary-string \"Radius = ${var.r}\" -x Circle")
+ self.runCmd(
+ "type summary add -w Category1 --summary-string \"Radius = ${var.r}\" -x Circle")
self.expect("frame variable r1 r2 r3",
- substrs = ['r1 = Width = ',
- 'r2 = Width = ',
- 'r3 = Width = '])
+ substrs=['r1 = Width = ',
+ 'r2 = Width = ',
+ 'r3 = Width = '])
self.expect("frame variable c1 c2 c3",
- substrs = ['c1 = Radius = ',
- 'c2 = Radius = ',
- 'c3 = Radius = '])
+ substrs=['c1 = Radius = ',
+ 'c2 = Radius = ',
+ 'c3 = Radius = '])
# Delete it
self.runCmd("type summary delete Circle -w Category1")
self.expect("frame variable c1 c2 c3",
- substrs = ['c1 = {',
- 'c2 = {',
- 'c3 = {'])
-
- # Change a summary inside a category and check that the change is reflected
- self.runCmd("type summary add Circle -w Category1 --summary-string \"summary1\"")
+ substrs=['c1 = {',
+ 'c2 = {',
+ 'c3 = {'])
+
+ # Change a summary inside a category and check that the change is
+ # reflected
+ self.runCmd(
+ "type summary add Circle -w Category1 --summary-string \"summary1\"")
self.expect("frame variable c1 c2 c3",
- substrs = ['c1 = summary1',
- 'c2 = summary1',
- 'c3 = summary1'])
+ substrs=['c1 = summary1',
+ 'c2 = summary1',
+ 'c3 = summary1'])
+
+ self.runCmd(
+ "type summary add Circle -w Category1 --summary-string \"summary2\"")
- self.runCmd("type summary add Circle -w Category1 --summary-string \"summary2\"")
-
self.expect("frame variable c1 c2 c3",
- substrs = ['c1 = summary2',
- 'c2 = summary2',
- 'c3 = summary2'])
+ substrs=['c1 = summary2',
+ 'c2 = summary2',
+ 'c3 = summary2'])
# Check that our order of priority works. Start by clearing categories
self.runCmd("type category delete Category1")
- self.runCmd("type summary add Shape -w BaseCategory --summary-string \"AShape\"")
+ self.runCmd(
+ "type summary add Shape -w BaseCategory --summary-string \"AShape\"")
self.runCmd("type category enable BaseCategory")
self.expect("print (Shape*)&c1",
- substrs = ['AShape'])
+ substrs=['AShape'])
self.expect("print (Shape*)&r1",
- substrs = ['AShape'])
+ substrs=['AShape'])
self.expect("print (Shape*)c_ptr",
- substrs = ['AShape'])
+ substrs=['AShape'])
self.expect("print (Shape*)r_ptr",
- substrs = ['AShape'])
+ substrs=['AShape'])
- self.runCmd("type summary add Circle -w CircleCategory --summary-string \"ACircle\"")
- self.runCmd("type summary add Rectangle -w RectangleCategory --summary-string \"ARectangle\"")
+ self.runCmd(
+ "type summary add Circle -w CircleCategory --summary-string \"ACircle\"")
+ self.runCmd(
+ "type summary add Rectangle -w RectangleCategory --summary-string \"ARectangle\"")
self.runCmd("type category enable CircleCategory")
self.expect("frame variable c1",
- substrs = ['ACircle'])
+ substrs=['ACircle'])
self.expect("frame variable c_ptr",
- substrs = ['ACircle'])
+ substrs=['ACircle'])
- self.runCmd("type summary add \"Rectangle *\" -w RectangleStarCategory --summary-string \"ARectangleStar\"")
+ self.runCmd(
+ "type summary add \"Rectangle *\" -w RectangleStarCategory --summary-string \"ARectangleStar\"")
self.runCmd("type category enable RectangleStarCategory")
self.expect("frame variable c1 r1 c_ptr r_ptr",
- substrs = ['ACircle',
- 'ARectangleStar'])
+ substrs=['ACircle',
+ 'ARectangleStar'])
self.runCmd("type category enable RectangleCategory")
self.expect("frame variable c1 r1 c_ptr r_ptr",
- substrs = ['ACircle',
- 'ACircle',
- 'ARectangle'])
+ substrs=['ACircle',
+ 'ACircle',
+ 'ARectangle'])
# Check that abruptly deleting an enabled category does not crash us
self.runCmd("type category delete RectangleCategory")
self.expect("frame variable c1 r1 c_ptr r_ptr",
- substrs = ['ACircle',
- '(Rectangle) r1 = ', 'w = 5', 'h = 6',
- 'ACircle',
- 'ARectangleStar'])
-
+ substrs=['ACircle',
+ '(Rectangle) r1 = ', 'w = 5', 'h = 6',
+ 'ACircle',
+ 'ARectangleStar'])
+
# check that list commands work
self.expect("type category list",
- substrs = ['RectangleStarCategory (enabled)'])
+ substrs=['RectangleStarCategory (enabled)'])
self.expect("type summary list",
- substrs = ['ARectangleStar'])
+ substrs=['ARectangleStar'])
# Disable a category and check that it fallsback
self.runCmd("type category disable CircleCategory")
-
+
# check that list commands work
self.expect("type category list",
- substrs = ['CircleCategory (disabled'])
+ substrs=['CircleCategory (disabled'])
self.expect("frame variable c1 r_ptr",
- substrs = ['AShape',
- 'ARectangleStar'])
+ substrs=['AShape',
+ 'ARectangleStar'])
# check that filters work into categories
- self.runCmd("type filter add Rectangle --child w --category RectangleCategory")
+ self.runCmd(
+ "type filter add Rectangle --child w --category RectangleCategory")
self.runCmd("type category enable RectangleCategory")
- self.runCmd("type summary add Rectangle --category RectangleCategory --summary-string \" \" -e")
+ self.runCmd(
+ "type summary add Rectangle --category RectangleCategory --summary-string \" \" -e")
self.expect('frame variable r2',
- substrs = ['w = 9'])
+ substrs=['w = 9'])
self.runCmd("type summary add Rectangle --summary-string \" \" -e")
self.expect('frame variable r2', matching=False,
- substrs = ['h = 16'])
+ substrs=['h = 16'])
# Now delete all categories
- self.runCmd("type category delete CircleCategory RectangleStarCategory BaseCategory RectangleCategory")
+ self.runCmd(
+ "type category delete CircleCategory RectangleStarCategory BaseCategory RectangleCategory")
# check that a deleted category with filter does not blow us up
self.expect('frame variable r2',
- substrs = ['w = 9',
- 'h = 16'])
+ substrs=['w = 9',
+ 'h = 16'])
# and also validate that one can print formatters for a language
- self.expect('type summary list -l c++', substrs=['vector', 'map', 'list', 'string'])
+ self.expect(
+ 'type summary list -l c++',
+ substrs=[
+ 'vector',
+ 'map',
+ 'list',
+ 'string'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class CppDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -22,24 +23,27 @@ class CppDataFormatterTestCase(TestBase)
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24462: Data formatters have problems on Windows")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24462: Data formatters have problems on Windows")
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)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
self.expect("frame variable",
- substrs = ['(Speed) SPILookHex = 5.55' # Speed by default is 5.55.
- ]);
+ substrs=['(Speed) SPILookHex = 5.55' # Speed by default is 5.55.
+ ])
# This is the function to remove the custom formats in order to have a
# clean slate for the next test case.
@@ -57,210 +61,238 @@ class CppDataFormatterTestCase(TestBase)
# The type format list should show our custom formats.
self.expect("type format list",
- substrs = ['RealNumber',
- 'Speed',
- 'BitField',
- 'Type1',
- 'Type2'])
+ substrs=['RealNumber',
+ 'Speed',
+ 'BitField',
+ 'Type1',
+ 'Type2'])
self.expect("frame variable",
- patterns = ['\(Speed\) SPILookHex = 0x[0-9a-f]+' # Speed should look hex-ish now.
- ]);
-
+ patterns=['\(Speed\) SPILookHex = 0x[0-9a-f]+' # Speed should look hex-ish now.
+ ])
+
# gcc4.2 on Mac OS X skips typedef chains in the DWARF output
- if self.getCompiler() in ['clang', 'llvm-gcc']:
+ if self.getCompiler() in ['clang', 'llvm-gcc']:
self.expect("frame variable",
- patterns = ['\(SignalMask\) SMILookHex = 0x[0-9a-f]+' # SignalMask should look hex-ish now.
- ]);
+ patterns=['\(SignalMask\) SMILookHex = 0x[0-9a-f]+' # SignalMask should look hex-ish now.
+ ])
self.expect("frame variable", matching=False,
- patterns = ['\(Type4\) T4ILookChar = 0x[0-9a-f]+' # Type4 should NOT look hex-ish now.
- ]);
-
+ patterns=['\(Type4\) T4ILookChar = 0x[0-9a-f]+' # Type4 should NOT look hex-ish now.
+ ])
+
# Now let's delete the 'Speed' custom format.
self.runCmd("type format delete Speed")
# The type format list should not show 'Speed' at this point.
self.expect("type format list", matching=False,
- substrs = ['Speed'])
+ substrs=['Speed'])
# Delete type format for 'Speed', we should expect an error message.
self.expect("type format delete Speed", error=True,
- substrs = ['no custom formatter for Speed'])
-
- self.runCmd("type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
-
+ substrs=['no custom formatter for Speed'])
+
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
+
self.expect("frame variable strarr",
- substrs = ['arr = "Hello world!"'])
-
+ substrs=['arr = "Hello world!"'])
+
self.runCmd("type summary clear")
-
- self.runCmd("type summary add --summary-string \"ptr = ${var%s}\" \"char *\" -v")
-
+
+ self.runCmd(
+ "type summary add --summary-string \"ptr = ${var%s}\" \"char *\" -v")
+
self.expect("frame variable strptr",
- substrs = ['ptr = "Hello world!"'])
-
- self.runCmd("type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
-
+ substrs=['ptr = "Hello world!"'])
+
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\" -v")
+
self.expect("frame variable strarr",
- substrs = ['arr = "Hello world!'])
+ substrs=['arr = "Hello world!'])
- # check that rdar://problem/10011145 (Standard summary format for char[] doesn't work as the result of "expr".) is solved
+ # check that rdar://problem/10011145 (Standard summary format for
+ # char[] doesn't work as the result of "expr".) is solved
self.expect("p strarr",
- substrs = ['arr = "Hello world!'])
+ substrs=['arr = "Hello world!'])
self.expect("frame variable strptr",
- substrs = ['ptr = "Hello world!"'])
+ substrs=['ptr = "Hello world!"'])
self.expect("p strptr",
- substrs = ['ptr = "Hello world!"'])
+ substrs=['ptr = "Hello world!"'])
- self.expect("p (char*)\"1234567890123456789012345678901234567890123456789012345678901234ABC\"",
- substrs = ['(char *) $', ' = ptr = ', ' "1234567890123456789012345678901234567890123456789012345678901234ABC"'])
+ self.expect(
+ "p (char*)\"1234567890123456789012345678901234567890123456789012345678901234ABC\"",
+ substrs=[
+ '(char *) $',
+ ' = ptr = ',
+ ' "1234567890123456789012345678901234567890123456789012345678901234ABC"'])
self.runCmd("type summary add -c Point")
-
+
self.expect("frame variable iAmSomewhere",
- substrs = ['x = 4',
- 'y = 6'])
-
+ substrs=['x = 4',
+ 'y = 6'])
+
self.expect("type summary list",
- substrs = ['Point',
- 'one-line'])
+ substrs=['Point',
+ 'one-line'])
self.runCmd("type summary add --summary-string \"y=${var.y%x}\" Point")
self.expect("frame variable iAmSomewhere",
- substrs = ['y=0x'])
-
- self.runCmd("type summary add --summary-string \"y=${var.y},x=${var.x}\" Point")
-
+ substrs=['y=0x'])
+
+ self.runCmd(
+ "type summary add --summary-string \"y=${var.y},x=${var.x}\" Point")
+
self.expect("frame variable iAmSomewhere",
- substrs = ['y=6',
- 'x=4'])
+ substrs=['y=6',
+ 'x=4'])
self.runCmd("type summary add --summary-string \"hello\" Point -e")
self.expect("type summary list",
- substrs = ['Point',
- 'show children'])
-
+ substrs=['Point',
+ 'show children'])
+
self.expect("frame variable iAmSomewhere",
- substrs = ['hello',
- 'x = 4',
- '}'])
+ substrs=['hello',
+ 'x = 4',
+ '}'])
- self.runCmd("type summary add --summary-string \"Sign: ${var[31]%B} Exponent: ${var[23-30]%x} Mantissa: ${var[0-22]%u}\" ShowMyGuts")
+ self.runCmd(
+ "type summary add --summary-string \"Sign: ${var[31]%B} Exponent: ${var[23-30]%x} Mantissa: ${var[0-22]%u}\" ShowMyGuts")
self.expect("frame variable cool_pointer->floating",
- substrs = ['Sign: true',
- 'Exponent: 0x',
- '80'])
+ substrs=['Sign: true',
+ 'Exponent: 0x',
+ '80'])
self.runCmd("type summary add --summary-string \"a test\" i_am_cool")
self.expect("frame variable cool_pointer",
- substrs = ['a test'])
+ substrs=['a test'])
+
+ self.runCmd(
+ "type summary add --summary-string \"a test\" i_am_cool --skip-pointers")
- self.runCmd("type summary add --summary-string \"a test\" i_am_cool --skip-pointers")
-
self.expect("frame variable cool_pointer",
- substrs = ['a test'],
- matching = False)
+ substrs=['a test'],
+ matching=False)
- self.runCmd("type summary add --summary-string \"${var[1-3]}\" \"int [5]\"")
+ self.runCmd(
+ "type summary add --summary-string \"${var[1-3]}\" \"int [5]\"")
self.expect("frame variable int_array",
- substrs = ['2',
- '3',
- '4'])
+ substrs=['2',
+ '3',
+ '4'])
self.runCmd("type summary clear")
- self.runCmd("type summary add --summary-string \"${var[0-2].integer}\" \"i_am_cool *\"")
- self.runCmd("type summary add --summary-string \"${var[2-4].integer}\" \"i_am_cool [5]\"")
+ self.runCmd(
+ "type summary add --summary-string \"${var[0-2].integer}\" \"i_am_cool *\"")
+ self.runCmd(
+ "type summary add --summary-string \"${var[2-4].integer}\" \"i_am_cool [5]\"")
self.expect("frame variable cool_array",
- substrs = ['1,1,6'])
+ substrs=['1,1,6'])
self.expect("frame variable cool_pointer",
- substrs = ['3,0,0'])
+ substrs=['3,0,0'])
# test special symbols for formatting variables into summaries
- self.runCmd("type summary add --summary-string \"cool object @ ${var%L}\" i_am_cool")
+ self.runCmd(
+ "type summary add --summary-string \"cool object @ ${var%L}\" i_am_cool")
self.runCmd("type summary delete \"i_am_cool [5]\"")
-
+
# this test might fail if the compiler tries to store
# these values into registers.. hopefully this is not
# going to be the case
self.expect("frame variable cool_array",
- substrs = ['[0] = cool object @ 0x',
- '[1] = cool object @ 0x',
- '[2] = cool object @ 0x',
- '[3] = cool object @ 0x',
- '[4] = cool object @ 0x'])
-
- # test getting similar output by exploiting ${var} = 'type @ location' for aggregates
+ substrs=['[0] = cool object @ 0x',
+ '[1] = cool object @ 0x',
+ '[2] = cool object @ 0x',
+ '[3] = cool object @ 0x',
+ '[4] = cool object @ 0x'])
+
+ # test getting similar output by exploiting ${var} = 'type @ location'
+ # for aggregates
self.runCmd("type summary add --summary-string \"${var}\" i_am_cool")
-
+
# this test might fail if the compiler tries to store
# these values into registers.. hopefully this is not
# going to be the case
self.expect("frame variable cool_array",
- substrs = ['[0] = i_am_cool @ 0x',
- '[1] = i_am_cool @ 0x',
- '[2] = i_am_cool @ 0x',
- '[3] = i_am_cool @ 0x',
- '[4] = i_am_cool @ 0x'])
-
-
- # test getting same output by exploiting %T and %L together for aggregates
- self.runCmd("type summary add --summary-string \"${var%T} @ ${var%L}\" i_am_cool")
-
+ substrs=['[0] = i_am_cool @ 0x',
+ '[1] = i_am_cool @ 0x',
+ '[2] = i_am_cool @ 0x',
+ '[3] = i_am_cool @ 0x',
+ '[4] = i_am_cool @ 0x'])
+
+ # test getting same output by exploiting %T and %L together for
+ # aggregates
+ self.runCmd(
+ "type summary add --summary-string \"${var%T} @ ${var%L}\" i_am_cool")
+
# this test might fail if the compiler tries to store
# these values into registers.. hopefully this is not
# going to be the case
self.expect("frame variable cool_array",
- substrs = ['[0] = i_am_cool @ 0x',
- '[1] = i_am_cool @ 0x',
- '[2] = i_am_cool @ 0x',
- '[3] = i_am_cool @ 0x',
- '[4] = i_am_cool @ 0x'])
-
+ substrs=['[0] = i_am_cool @ 0x',
+ '[1] = i_am_cool @ 0x',
+ '[2] = i_am_cool @ 0x',
+ '[3] = i_am_cool @ 0x',
+ '[4] = i_am_cool @ 0x'])
+
self.runCmd("type summary add --summary-string \"goofy\" i_am_cool")
- self.runCmd("type summary add --summary-string \"${var.second_cool%S}\" i_am_cooler")
+ self.runCmd(
+ "type summary add --summary-string \"${var.second_cool%S}\" i_am_cooler")
self.expect("frame variable the_coolest_guy",
- substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
+ substrs=['(i_am_cooler) the_coolest_guy = goofy'])
# check that unwanted type specifiers are removed
self.runCmd("type summary delete i_am_cool")
- self.runCmd("type summary add --summary-string \"goofy\" \"class i_am_cool\"")
+ self.runCmd(
+ "type summary add --summary-string \"goofy\" \"class i_am_cool\"")
self.expect("frame variable the_coolest_guy",
- substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
+ substrs=['(i_am_cooler) the_coolest_guy = goofy'])
self.runCmd("type summary delete i_am_cool")
- self.runCmd("type summary add --summary-string \"goofy\" \"enum i_am_cool\"")
+ self.runCmd(
+ "type summary add --summary-string \"goofy\" \"enum i_am_cool\"")
self.expect("frame variable the_coolest_guy",
- substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
+ substrs=['(i_am_cooler) the_coolest_guy = goofy'])
self.runCmd("type summary delete i_am_cool")
- self.runCmd("type summary add --summary-string \"goofy\" \"struct i_am_cool\"")
+ self.runCmd(
+ "type summary add --summary-string \"goofy\" \"struct i_am_cool\"")
self.expect("frame variable the_coolest_guy",
- substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
+ substrs=['(i_am_cooler) the_coolest_guy = goofy'])
# many spaces, but we still do the right thing
self.runCmd("type summary delete i_am_cool")
- self.runCmd("type summary add --summary-string \"goofy\" \"union i_am_cool\"")
+ self.runCmd(
+ "type summary add --summary-string \"goofy\" \"union i_am_cool\"")
self.expect("frame variable the_coolest_guy",
- substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
+ substrs=['(i_am_cooler) the_coolest_guy = goofy'])
# but that not *every* specifier is removed
self.runCmd("type summary delete i_am_cool")
- self.runCmd("type summary add --summary-string \"goofy\" \"wrong i_am_cool\"")
+ self.runCmd(
+ "type summary add --summary-string \"goofy\" \"wrong i_am_cool\"")
self.expect("frame variable the_coolest_guy", matching=False,
- substrs = ['(i_am_cooler) the_coolest_guy = goofy'])
+ substrs=['(i_am_cooler) the_coolest_guy = goofy'])
- # check that formats are not sticking since that is the behavior we want
- self.expect("frame variable iAmInt --format hex", substrs = ['(int) iAmInt = 0x00000001'])
- self.expect("frame variable iAmInt", matching=False, substrs = ['(int) iAmInt = 0x00000001'])
- self.expect("frame variable iAmInt", substrs = ['(int) iAmInt = 1'])
+ # check that formats are not sticking since that is the behavior we
+ # want
+ self.expect("frame variable iAmInt --format hex",
+ substrs=['(int) iAmInt = 0x00000001'])
+ self.expect(
+ "frame variable iAmInt",
+ matching=False,
+ substrs=['(int) iAmInt = 0x00000001'])
+ self.expect("frame variable iAmInt", substrs=['(int) iAmInt = 1'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DataFormatterDisablingTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -22,62 +23,69 @@ class DataFormatterDisablingTestCase(Tes
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
def test_with_run_command(self):
"""Check that we can properly disable all data formatter categories."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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 category enable *', check=False)
+ self.runCmd('type category enable *', check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
#self.runCmd('type category enable system VectorTypes libcxx gnu-libstdc++ CoreGraphics CoreServices AppKit CoreFoundation objc default', check=False)
- self.expect('type category list', substrs = ['system','enabled',])
+ self.expect('type category list', substrs=['system', 'enabled', ])
self.expect("frame variable numbers",
- substrs = ['[0] = 1', '[3] = 1234'])
+ substrs=['[0] = 1', '[3] = 1234'])
- self.expect('frame variable string1', substrs = ['hello world'])
+ self.expect('frame variable string1', substrs=['hello world'])
# now disable them all and check that nothing is formatted
self.runCmd('type category disable *')
self.expect("frame variable numbers", matching=False,
- substrs = ['[0] = 1', '[3] = 1234'])
+ substrs=['[0] = 1', '[3] = 1234'])
+
+ self.expect(
+ 'frame variable string1',
+ matching=False,
+ substrs=['hello world'])
- self.expect('frame variable string1', matching=False, substrs = ['hello world'])
+ self.expect('type summary list', substrs=[
+ 'Category: system (disabled)'])
- self.expect('type summary list', substrs=['Category: system (disabled)'])
+ self.expect('type category list', substrs=['system', 'disabled', ])
- self.expect('type category list', substrs = ['system','disabled',])
-
# now enable and check that we are back to normal
self.runCmd("type category enable *")
- self.expect('type category list', substrs = ['system','enabled'])
+ self.expect('type category list', substrs=['system', 'enabled'])
self.expect("frame variable numbers",
- substrs = ['[0] = 1', '[3] = 1234'])
+ substrs=['[0] = 1', '[3] = 1234'])
- self.expect('frame variable string1', substrs = ['hello world'])
+ self.expect('frame variable string1', substrs=['hello world'])
- self.expect('type category list', substrs = ['system','enabled'])
+ self.expect('type category list', substrs=['system', 'enabled'])
# last check - our cleanup will re-enable everything
self.runCmd('type category disable *')
- self.expect('type category list', substrs = ['system','disabled'])
+ self.expect('type category list', substrs=['system', 'disabled'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class EnumFormatTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,21 +27,22 @@ class EnumFormatTestCase(TestBase):
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
self.expect("frame variable",
- substrs = ['(Foo) f = Case45',
- '(int) x = 1',
- '(int) y = 45',
- '(int) z = 43'
- ]);
+ substrs=['(Foo) f = Case45',
+ '(int) x = 1',
+ '(int) y = 45',
+ '(int) z = 43'
+ ])
# This is the function to remove the custom formats in order to have a
# clean slate for the next test case.
@@ -55,11 +57,11 @@ class EnumFormatTestCase(TestBase):
# The type format list should show our custom formats.
self.expect("type format list -w default",
- substrs = ['int: as type Foo'])
+ substrs=['int: as type Foo'])
self.expect("frame variable",
- substrs = ['(Foo) f = Case45',
- '(int) x = Case1',
- '(int) y = Case45',
- '(int) z = 43'
- ]);
+ substrs=['(Foo) f = Case45',
+ '(int) x = Case1',
+ '(int) y = Case45',
+ '(int) z = 43'
+ ])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class GlobalsDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,7 +27,8 @@ class GlobalsDataFormatterTestCase(TestB
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
# This is the function to remove the custom formats in order to have a
# clean slate for the next test case.
@@ -41,27 +43,29 @@ class GlobalsDataFormatterTestCase(TestB
# Simply check we can get at global variables
self.expect("target variable g_point",
- substrs = ['JustATest'])
+ substrs=['JustATest'])
self.expect("target variable g_point_pointer",
- substrs = ['(Point *) g_point_pointer ='])
+ substrs=['(Point *) g_point_pointer ='])
# Print some information about the variables
# (we ignore the actual values)
- self.runCmd("type summary add --summary-string \"(x=${var.x},y=${var.y})\" Point")
+ self.runCmd(
+ "type summary add --summary-string \"(x=${var.x},y=${var.y})\" Point")
self.expect("target variable g_point",
- substrs = ['x=',
- 'y='])
-
+ substrs=['x=',
+ 'y='])
+
self.expect("target variable g_point_pointer",
- substrs = ['(Point *) g_point_pointer ='])
+ substrs=['(Point *) g_point_pointer ='])
# Test Python code on resulting SBValue
- self.runCmd("type summary add --python-script \"return 'x=' + str(valobj.GetChildMemberWithName('x').GetValue());\" Point")
+ self.runCmd(
+ "type summary add --python-script \"return 'x=' + str(valobj.GetChildMemberWithName('x').GetValue());\" Point")
self.expect("target variable g_point",
- substrs = ['x='])
-
+ substrs=['x='])
+
self.expect("target variable g_point_pointer",
- substrs = ['(Point *) g_point_pointer ='])
+ substrs=['(Point *) g_point_pointer ='])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class NamedSummariesDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,15 +27,16 @@ class NamedSummariesDataFormatterTestCas
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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():
@@ -44,81 +46,88 @@ class NamedSummariesDataFormatterTestCas
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
- self.runCmd("type summary add --summary-string \"AllUseIt: x=${var.x} {y=${var.y}} {z=${var.z}}\" --name AllUseIt")
- self.runCmd("type summary add --summary-string \"First: x=${var.x} y=${var.y} dummy=${var.dummy}\" First")
- self.runCmd("type summary add --summary-string \"Second: x=${var.x} y=${var.y%hex}\" Second")
- self.runCmd("type summary add --summary-string \"Third: x=${var.x} z=${var.z}\" Third")
-
+ self.runCmd(
+ "type summary add --summary-string \"AllUseIt: x=${var.x} {y=${var.y}} {z=${var.z}}\" --name AllUseIt")
+ self.runCmd(
+ "type summary add --summary-string \"First: x=${var.x} y=${var.y} dummy=${var.dummy}\" First")
+ self.runCmd(
+ "type summary add --summary-string \"Second: x=${var.x} y=${var.y%hex}\" Second")
+ self.runCmd(
+ "type summary add --summary-string \"Third: x=${var.x} z=${var.z}\" Third")
+
self.expect('type summary list', substrs=['AllUseIt'])
-
+
self.expect("frame variable first",
- substrs = ['First: x=12'])
+ substrs=['First: x=12'])
self.expect("frame variable first --summary AllUseIt",
- substrs = ['AllUseIt: x=12'])
-
+ substrs=['AllUseIt: x=12'])
+
# We *DO NOT* remember the summary choice anymore
self.expect("frame variable first", matching=False,
- substrs = ['AllUseIt: x=12'])
+ substrs=['AllUseIt: x=12'])
self.expect("frame variable first",
- substrs = ['First: x=12'])
+ substrs=['First: x=12'])
+
+ self.runCmd("thread step-over") # 2
- self.runCmd("thread step-over") # 2
-
self.expect("frame variable first",
- substrs = ['First: x=12'])
-
+ substrs=['First: x=12'])
+
self.expect("frame variable first --summary AllUseIt",
- substrs = ['AllUseIt: x=12',
- 'y=34'])
+ substrs=['AllUseIt: x=12',
+ 'y=34'])
self.expect("frame variable second --summary AllUseIt",
- substrs = ['AllUseIt: x=65',
- 'y=43.25'])
+ substrs=['AllUseIt: x=65',
+ 'y=43.25'])
self.expect("frame variable third --summary AllUseIt",
- substrs = ['AllUseIt: x=96',
- 'z=',
- 'E'])
+ substrs=['AllUseIt: x=96',
+ 'z=',
+ 'E'])
+
+ self.runCmd("thread step-over") # 3
- self.runCmd("thread step-over") # 3
-
self.expect("frame variable second",
- substrs = ['Second: x=65',
- 'y=0x'])
-
+ substrs=['Second: x=65',
+ 'y=0x'])
+
# <rdar://problem/11576143> decided that invalid summaries will raise an error
# instead of just defaulting to the base summary
- self.expect("frame variable second --summary NoSuchSummary",error=True,
- substrs = ['must specify a valid named summary'])
-
+ self.expect(
+ "frame variable second --summary NoSuchSummary",
+ error=True,
+ substrs=['must specify a valid named summary'])
+
self.runCmd("thread step-over")
-
- self.runCmd("type summary add --summary-string \"FirstAndFriends: x=${var.x} {y=${var.y}} {z=${var.z}}\" First --name FirstAndFriends")
-
+
+ self.runCmd(
+ "type summary add --summary-string \"FirstAndFriends: x=${var.x} {y=${var.y}} {z=${var.z}}\" First --name FirstAndFriends")
+
self.expect("frame variable first",
- substrs = ['FirstAndFriends: x=12',
- 'y=34'])
+ substrs=['FirstAndFriends: x=12',
+ 'y=34'])
self.runCmd("type summary delete First")
-
+
self.expect("frame variable first --summary FirstAndFriends",
- substrs = ['FirstAndFriends: x=12',
- 'y=34'])
-
+ substrs=['FirstAndFriends: x=12',
+ 'y=34'])
+
self.expect("frame variable first", matching=True,
- substrs = ['x = 12',
- 'y = 34'])
-
+ substrs=['x = 12',
+ 'y = 34'])
+
self.runCmd("type summary delete FirstAndFriends")
self.expect("type summary delete NoSuchSummary", error=True)
self.runCmd("type summary delete AllUseIt")
-
+
self.expect("frame variable first", matching=False,
- substrs = ['FirstAndFriends'])
+ substrs=['FirstAndFriends'])
- self.runCmd("thread step-over") # 4
+ self.runCmd("thread step-over") # 4
- self.expect("frame variable first",matching=False,
- substrs = ['FirstAndFriends: x=12',
- 'y=34'])
+ self.expect("frame variable first", matching=False,
+ substrs=['FirstAndFriends: x=12',
+ 'y=34'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py Tue Sep 6 15:57:50 2016
@@ -6,14 +6,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class ObjCDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -24,7 +25,7 @@ class ObjCDataFormatterTestCase(TestBase
self.build()
self.plain_data_formatter_commands()
- def appkit_tester_impl(self,commands):
+ def appkit_tester_impl(self, commands):
self.build()
self.appkit_common_data_formatters_command()
commands()
@@ -49,25 +50,21 @@ class ObjCDataFormatterTestCase(TestBase
"""Test formatters for NSURL."""
self.appkit_tester_impl(self.nsurl_data_formatter_commands)
-
@skipUnlessDarwin
def test_nserror_with_run_command(self):
"""Test formatters for NSError."""
self.appkit_tester_impl(self.nserror_data_formatter_commands)
-
@skipUnlessDarwin
def test_nsbundle_with_run_command(self):
"""Test formatters for NSBundle."""
self.appkit_tester_impl(self.nsbundle_data_formatter_commands)
-
@skipUnlessDarwin
def test_nsexception_with_run_command(self):
"""Test formatters for NSException."""
self.appkit_tester_impl(self.nsexception_data_formatter_commands)
-
@skipUnlessDarwin
def test_nsdate_with_run_command(self):
"""Test formatters for NSDate."""
@@ -101,14 +98,15 @@ class ObjCDataFormatterTestCase(TestBase
"""Test basic ObjC formatting behavior."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -123,57 +121,58 @@ class ObjCDataFormatterTestCase(TestBase
self.runCmd("type summary add --summary-string \"${var%@}\" MyClass")
self.expect("frame variable object2",
- substrs = ['MyOtherClass']);
-
+ substrs=['MyOtherClass'])
+
self.expect("frame variable *object2",
- substrs = ['MyOtherClass']);
+ substrs=['MyOtherClass'])
# Now let's delete the 'MyClass' custom summary.
self.runCmd("type summary delete MyClass")
# The type format list should not show 'MyClass' at this point.
self.expect("type summary list", matching=False,
- substrs = ['MyClass'])
+ substrs=['MyClass'])
self.runCmd("type summary add --summary-string \"a test\" MyClass")
-
+
self.expect("frame variable *object2",
- substrs = ['*object2 =',
- 'MyClass = a test',
- 'backup = ']);
-
+ substrs=['*object2 =',
+ 'MyClass = a test',
+ 'backup = '])
+
self.expect("frame variable object2", matching=False,
- substrs = ['a test']);
-
+ substrs=['a test'])
+
self.expect("frame variable object",
- substrs = ['a test']);
-
+ substrs=['a test'])
+
self.expect("frame variable *object",
- substrs = ['a test']);
+ substrs=['a test'])
self.expect('frame variable myclass',
- substrs = ['(Class) myclass = NSValue'])
+ substrs=['(Class) myclass = NSValue'])
self.expect('frame variable myclass2',
- substrs = ['(Class) myclass2 = ','NS','String'])
+ substrs=['(Class) myclass2 = ', 'NS', 'String'])
self.expect('frame variable myclass3',
- substrs = ['(Class) myclass3 = Molecule'])
+ substrs=['(Class) myclass3 = Molecule'])
self.expect('frame variable myclass4',
- substrs = ['(Class) myclass4 = NSMutableArray'])
+ substrs=['(Class) myclass4 = NSMutableArray'])
self.expect('frame variable myclass5',
- substrs = ['(Class) myclass5 = nil'])
+ substrs=['(Class) myclass5 = nil'])
def appkit_common_data_formatters_command(self):
"""Test formatters for AppKit classes."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -184,132 +183,183 @@ class ObjCDataFormatterTestCase(TestBase
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
-
+
def nsnumber_data_formatter_commands(self):
# Now enable AppKit and check we are displaying Cocoa classes correctly
self.expect('frame variable num1 num2 num3 num4 num5 num6 num7 num9',
- substrs = ['(NSNumber *) num1 = ',' (int)5',
- '(NSNumber *) num2 = ',' (float)3.1',
- '(NSNumber *) num3 = ',' (double)3.14',
- '(NSNumber *) num4 = ',' (long)-2',
- '(NSNumber *) num5 = ',' (char)65',
- '(NSNumber *) num6 = ',' (long)255',
- '(NSNumber *) num7 = ','2000000',
- '(NSNumber *) num9 = ',' (short)-31616'])
+ substrs=['(NSNumber *) num1 = ', ' (int)5',
+ '(NSNumber *) num2 = ', ' (float)3.1',
+ '(NSNumber *) num3 = ', ' (double)3.14',
+ '(NSNumber *) num4 = ', ' (long)-2',
+ '(NSNumber *) num5 = ', ' (char)65',
+ '(NSNumber *) num6 = ', ' (long)255',
+ '(NSNumber *) num7 = ', '2000000',
+ '(NSNumber *) num9 = ', ' (short)-31616'])
self.expect('frame variable num_at1 num_at2 num_at3 num_at4',
- substrs = ['(NSNumber *) num_at1 = ',' (int)12',
- '(NSNumber *) num_at2 = ',' (int)-12',
- '(NSNumber *) num_at3 = ',' (double)12.5',
- '(NSNumber *) num_at4 = ',' (double)-12.5'])
+ substrs=['(NSNumber *) num_at1 = ', ' (int)12',
+ '(NSNumber *) num_at2 = ', ' (int)-12',
+ '(NSNumber *) num_at3 = ', ' (double)12.5',
+ '(NSNumber *) num_at4 = ', ' (double)-12.5'])
def nscontainers_data_formatter_commands(self):
- self.expect('frame variable newArray newDictionary newMutableDictionary cfarray_ref mutable_array_ref',
- substrs = ['(NSArray *) newArray = ','@"50 elements"',
- '(NSDictionary *) newDictionary = ',' 12 key/value pairs',
- '(NSDictionary *) newMutableDictionary = ',' 21 key/value pairs',
- '(CFArrayRef) cfarray_ref = ','@"3 elements"',
- '(CFMutableArrayRef) mutable_array_ref = ','@"11 elements"'])
+ self.expect(
+ 'frame variable newArray newDictionary newMutableDictionary cfarray_ref mutable_array_ref',
+ substrs=[
+ '(NSArray *) newArray = ',
+ '@"50 elements"',
+ '(NSDictionary *) newDictionary = ',
+ ' 12 key/value pairs',
+ '(NSDictionary *) newMutableDictionary = ',
+ ' 21 key/value pairs',
+ '(CFArrayRef) cfarray_ref = ',
+ '@"3 elements"',
+ '(CFMutableArrayRef) mutable_array_ref = ',
+ '@"11 elements"'])
self.expect('frame variable iset1 iset2 imset',
- substrs = ['4 indexes','512 indexes','10 indexes'])
-
- self.expect('frame variable binheap_ref',
- substrs = ['(CFBinaryHeapRef) binheap_ref = ','@"21 items"'])
+ substrs=['4 indexes', '512 indexes', '10 indexes'])
- self.expect('expression -d run -- [NSArray new]', substrs=['@"0 elements"'])
+ self.expect(
+ 'frame variable binheap_ref',
+ substrs=[
+ '(CFBinaryHeapRef) binheap_ref = ',
+ '@"21 items"'])
+
+ self.expect(
+ 'expression -d run -- [NSArray new]',
+ substrs=['@"0 elements"'])
def nsdata_data_formatter_commands(self):
- self.expect('frame variable immutableData mutableData data_ref mutable_data_ref mutable_string_ref',
- substrs = ['(NSData *) immutableData = ',' 4 bytes',
- '(NSData *) mutableData = ',' 14 bytes',
- '(CFDataRef) data_ref = ','@"5 bytes"',
- '(CFMutableDataRef) mutable_data_ref = ','@"5 bytes"',
- '(CFMutableStringRef) mutable_string_ref = ',' @"Wish ya knew"'])
+ self.expect(
+ 'frame variable immutableData mutableData data_ref mutable_data_ref mutable_string_ref',
+ substrs=[
+ '(NSData *) immutableData = ',
+ ' 4 bytes',
+ '(NSData *) mutableData = ',
+ ' 14 bytes',
+ '(CFDataRef) data_ref = ',
+ '@"5 bytes"',
+ '(CFMutableDataRef) mutable_data_ref = ',
+ '@"5 bytes"',
+ '(CFMutableStringRef) mutable_string_ref = ',
+ ' @"Wish ya knew"'])
def nsurl_data_formatter_commands(self):
- self.expect('frame variable cfurl_ref cfchildurl_ref cfgchildurl_ref',
- substrs = ['(CFURLRef) cfurl_ref = ','@"http://www.foo.bar',
- 'cfchildurl_ref = ','@"page.html -- http://www.foo.bar',
- '(CFURLRef) cfgchildurl_ref = ','@"?whatever -- http://www.foo.bar/page.html"'])
-
- self.expect('frame variable nsurl nsurl2 nsurl3',
- substrs = ['(NSURL *) nsurl = ','@"http://www.foo.bar',
- '(NSURL *) nsurl2 =','@"page.html -- http://www.foo.bar',
- '(NSURL *) nsurl3 = ','@"?whatever -- http://www.foo.bar/page.html"'])
+ self.expect(
+ 'frame variable cfurl_ref cfchildurl_ref cfgchildurl_ref',
+ substrs=[
+ '(CFURLRef) cfurl_ref = ',
+ '@"http://www.foo.bar',
+ 'cfchildurl_ref = ',
+ '@"page.html -- http://www.foo.bar',
+ '(CFURLRef) cfgchildurl_ref = ',
+ '@"?whatever -- http://www.foo.bar/page.html"'])
+
+ self.expect(
+ 'frame variable nsurl nsurl2 nsurl3',
+ substrs=[
+ '(NSURL *) nsurl = ',
+ '@"http://www.foo.bar',
+ '(NSURL *) nsurl2 =',
+ '@"page.html -- http://www.foo.bar',
+ '(NSURL *) nsurl3 = ',
+ '@"?whatever -- http://www.foo.bar/page.html"'])
def nserror_data_formatter_commands(self):
self.expect('frame variable nserror',
- substrs = ['domain: @"Foobar" - code: 12'])
+ substrs=['domain: @"Foobar" - code: 12'])
self.expect('frame variable nserrorptr',
- substrs = ['domain: @"Foobar" - code: 12'])
+ substrs=['domain: @"Foobar" - code: 12'])
self.expect('frame variable nserror->_userInfo',
- substrs = ['2 key/value pairs'])
+ substrs=['2 key/value pairs'])
- self.expect('frame variable nserror->_userInfo --ptr-depth 1 -d run-target',
- substrs = ['@"a"','@"b"',"1","2"])
+ self.expect(
+ 'frame variable nserror->_userInfo --ptr-depth 1 -d run-target',
+ substrs=[
+ '@"a"',
+ '@"b"',
+ "1",
+ "2"])
def nsbundle_data_formatter_commands(self):
- self.expect('frame variable bundle_string bundle_url main_bundle',
- substrs = ['(NSBundle *) bundle_string = ',' @"/System/Library/Frameworks/Accelerate.framework"',
- '(NSBundle *) bundle_url = ',' @"/System/Library/Frameworks/Foundation.framework"',
- '(NSBundle *) main_bundle = ','data-formatter-objc'])
+ self.expect(
+ 'frame variable bundle_string bundle_url main_bundle',
+ substrs=[
+ '(NSBundle *) bundle_string = ',
+ ' @"/System/Library/Frameworks/Accelerate.framework"',
+ '(NSBundle *) bundle_url = ',
+ ' @"/System/Library/Frameworks/Foundation.framework"',
+ '(NSBundle *) main_bundle = ',
+ 'data-formatter-objc'])
def nsexception_data_formatter_commands(self):
- self.expect('frame variable except0 except1 except2 except3',
- substrs = ['(NSException *) except0 = ','name: @"TheGuyWhoHasNoName" - reason: @"cuz it\'s funny"',
- '(NSException *) except1 = ','name: @"TheGuyWhoHasNoName~1" - reason: @"cuz it\'s funny"',
- '(NSException *) except2 = ','name: @"TheGuyWhoHasNoName`2" - reason: @"cuz it\'s funny"',
- '(NSException *) except3 = ','name: @"TheGuyWhoHasNoName/3" - reason: @"cuz it\'s funny"'])
+ self.expect(
+ 'frame variable except0 except1 except2 except3',
+ substrs=[
+ '(NSException *) except0 = ',
+ 'name: @"TheGuyWhoHasNoName" - reason: @"cuz it\'s funny"',
+ '(NSException *) except1 = ',
+ 'name: @"TheGuyWhoHasNoName~1" - reason: @"cuz it\'s funny"',
+ '(NSException *) except2 = ',
+ 'name: @"TheGuyWhoHasNoName`2" - reason: @"cuz it\'s funny"',
+ '(NSException *) except3 = ',
+ 'name: @"TheGuyWhoHasNoName/3" - reason: @"cuz it\'s funny"'])
def nsdate_data_formatter_commands(self):
- self.expect('frame variable date1 date2',
- patterns = ['(1985-04-10|1985-04-11)','(2011-01-01|2010-12-31)'])
+ self.expect(
+ 'frame variable date1 date2',
+ patterns=[
+ '(1985-04-10|1985-04-11)',
+ '(2011-01-01|2010-12-31)'])
# this test might fail if we hit the breakpoint late on December 31st of some given year
# and midnight comes between hitting the breakpoint and running this line of code
# hopefully the output will be revealing enough in that case :-)
now_year = '%s-' % str(datetime.datetime.now().year)
- self.expect('frame variable date3', substrs = [now_year])
- self.expect('frame variable date4', substrs = ['1970'])
- self.expect('frame variable date5', substrs = [now_year])
+ self.expect('frame variable date3', substrs=[now_year])
+ self.expect('frame variable date4', substrs=['1970'])
+ self.expect('frame variable date5', substrs=[now_year])
self.expect('frame variable date1_abs date2_abs',
- substrs = ['1985-04','2011-01'])
+ substrs=['1985-04', '2011-01'])
- self.expect('frame variable date3_abs', substrs = [now_year])
- self.expect('frame variable date4_abs', substrs = ['1970'])
- self.expect('frame variable date5_abs', substrs = [now_year])
+ self.expect('frame variable date3_abs', substrs=[now_year])
+ self.expect('frame variable date4_abs', substrs=['1970'])
+ self.expect('frame variable date5_abs', substrs=[now_year])
self.expect('frame variable cupertino home europe',
- substrs = ['@"America/Los_Angeles"',
- '@"Europe/Rome"',
- '@"Europe/Paris"'])
+ substrs=['@"America/Los_Angeles"',
+ '@"Europe/Rome"',
+ '@"Europe/Paris"'])
self.expect('frame variable cupertino_ns home_ns europe_ns',
- substrs = ['@"America/Los_Angeles"',
- '@"Europe/Rome"',
- '@"Europe/Paris"'])
-
- self.expect('frame variable mut_bv',
- substrs = ['(CFMutableBitVectorRef) mut_bv = ', '1110 0110 1011 0000 1101 1010 1000 1111 0011 0101 1101 0001 00'])
-
+ substrs=['@"America/Los_Angeles"',
+ '@"Europe/Rome"',
+ '@"Europe/Paris"'])
+
+ self.expect(
+ 'frame variable mut_bv',
+ substrs=[
+ '(CFMutableBitVectorRef) mut_bv = ',
+ '1110 0110 1011 0000 1101 1010 1000 1111 0011 0101 1101 0001 00'])
def expr_objc_data_formatter_commands(self):
"""Test common cases of expression parser <--> formatters interaction."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -323,36 +373,41 @@ class ObjCDataFormatterTestCase(TestBase
# check that the formatters are able to deal safely and correctly
# with ValueObjects that the expression parser returns
- self.expect('expression ((id)@"Hello for long enough to avoid short string types")', matching=False,
- substrs = ['Hello for long enough to avoid short string types'])
-
- self.expect('expression -d run -- ((id)@"Hello for long enough to avoid short string types")',
- substrs = ['Hello for long enough to avoid short string types'])
+ self.expect(
+ 'expression ((id)@"Hello for long enough to avoid short string types")',
+ matching=False,
+ substrs=['Hello for long enough to avoid short string types'])
+
+ self.expect(
+ 'expression -d run -- ((id)@"Hello for long enough to avoid short string types")',
+ substrs=['Hello for long enough to avoid short string types'])
self.expect('expr -d run -- label1',
- substrs = ['Process Name'])
-
- self.expect('expr -d run -- @"Hello for long enough to avoid short string types"',
- substrs = ['Hello for long enough to avoid short string types'])
-
- self.expect('expr -d run --object-description -- @"Hello for long enough to avoid short string types"',
- substrs = ['Hello for long enough to avoid short string types'])
- self.expect('expr -d run --object-description -- @"Hello"', matching=False,
- substrs = ['@"Hello" Hello'])
+ substrs=['Process Name'])
+ self.expect(
+ 'expr -d run -- @"Hello for long enough to avoid short string types"',
+ substrs=['Hello for long enough to avoid short string types'])
+
+ self.expect(
+ 'expr -d run --object-description -- @"Hello for long enough to avoid short string types"',
+ substrs=['Hello for long enough to avoid short string types'])
+ self.expect('expr -d run --object-description -- @"Hello"',
+ matching=False, substrs=['@"Hello" Hello'])
def cf_data_formatter_commands(self):
"""Test formatters for Core OSX frameworks."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -361,50 +416,53 @@ class ObjCDataFormatterTestCase(TestBase
self.runCmd('type summary clear', check=False)
self.runCmd('type synth clear', check=False)
-
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
# check formatters for common Objective-C types
- expect_strings = ['(CFGregorianUnits) cf_greg_units = 1 years, 3 months, 5 days, 12 hours, 5 minutes 7 seconds',
- '(CFRange) cf_range = location=4 length=4',
- '(NSPoint) ns_point = (x = 4, y = 4)',
- '(NSRange) ns_range = location=4, length=4',
- '(NSRect) ns_rect = (origin = (x = 1, y = 1), size = (width = 5, height = 5))',
- '(NSRectArray) ns_rect_arr = ((x = 1, y = 1), (width = 5, height = 5)), ...',
- '(NSSize) ns_size = (width = 5, height = 7)',
- '(CGSize) cg_size = (width = 1, height = 6)',
- '(CGPoint) cg_point = (x = 2, y = 7)',
- '(CGRect) cg_rect = (origin = (x = 1, y = 2), size = (width = 7, height = 7))',
- '(Rect) rect = (t=4, l=8, b=4, r=7)',
- '(Rect *) rect_ptr = (t=4, l=8, b=4, r=7)',
- '(Point) point = (v=7, h=12)',
- '(Point *) point_ptr = (v=7, h=12)',
- '1985',
- 'foo_selector_impl'];
-
+ expect_strings = [
+ '(CFGregorianUnits) cf_greg_units = 1 years, 3 months, 5 days, 12 hours, 5 minutes 7 seconds',
+ '(CFRange) cf_range = location=4 length=4',
+ '(NSPoint) ns_point = (x = 4, y = 4)',
+ '(NSRange) ns_range = location=4, length=4',
+ '(NSRect) ns_rect = (origin = (x = 1, y = 1), size = (width = 5, height = 5))',
+ '(NSRectArray) ns_rect_arr = ((x = 1, y = 1), (width = 5, height = 5)), ...',
+ '(NSSize) ns_size = (width = 5, height = 7)',
+ '(CGSize) cg_size = (width = 1, height = 6)',
+ '(CGPoint) cg_point = (x = 2, y = 7)',
+ '(CGRect) cg_rect = (origin = (x = 1, y = 2), size = (width = 7, height = 7))',
+ '(Rect) rect = (t=4, l=8, b=4, r=7)',
+ '(Rect *) rect_ptr = (t=4, l=8, b=4, r=7)',
+ '(Point) point = (v=7, h=12)',
+ '(Point *) point_ptr = (v=7, h=12)',
+ '1985',
+ 'foo_selector_impl']
+
if self.getArchitecture() in ['i386', 'x86_64']:
expect_strings.append('(HIPoint) hi_point = (x=7, y=12)')
- expect_strings.append('(HIRect) hi_rect = origin=(x = 3, y = 5) size=(width = 4, height = 6)')
- expect_strings.append('(RGBColor) rgb_color = red=3 green=56 blue=35')
- expect_strings.append('(RGBColor *) rgb_color_ptr = red=3 green=56 blue=35')
-
- self.expect("frame variable",
- substrs = expect_strings)
+ expect_strings.append(
+ '(HIRect) hi_rect = origin=(x = 3, y = 5) size=(width = 4, height = 6)')
+ expect_strings.append(
+ '(RGBColor) rgb_color = red=3 green=56 blue=35')
+ expect_strings.append(
+ '(RGBColor *) rgb_color_ptr = red=3 green=56 blue=35')
+ self.expect("frame variable",
+ substrs=expect_strings)
def kvo_data_formatter_commands(self):
"""Test the behavior of formatters when KVO is in use."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -420,18 +478,23 @@ class ObjCDataFormatterTestCase(TestBase
# we should be able to dynamically figure out that the KVO implementor class
# is a subclass of Molecule, and use the appropriate summary for it
self.runCmd("type summary add -s JustAMoleculeHere Molecule")
- self.expect('frame variable molecule', substrs = ['JustAMoleculeHere'])
+ self.expect('frame variable molecule', substrs=['JustAMoleculeHere'])
self.runCmd("next")
self.expect("thread list",
- substrs = ['stopped',
- 'step over'])
- self.expect('frame variable molecule', substrs = ['JustAMoleculeHere'])
+ substrs=['stopped',
+ 'step over'])
+ self.expect('frame variable molecule', substrs=['JustAMoleculeHere'])
self.runCmd("next")
- # check that NSMutableDictionary's formatter is not confused when dealing with a KVO'd dictionary
- self.expect('frame variable newMutableDictionary', substrs = ['(NSDictionary *) newMutableDictionary = ',' 21 key/value pairs'])
+ # check that NSMutableDictionary's formatter is not confused when
+ # dealing with a KVO'd dictionary
+ self.expect(
+ 'frame variable newMutableDictionary',
+ substrs=[
+ '(NSDictionary *) newMutableDictionary = ',
+ ' 21 key/value pairs'])
- lldbutil.run_break_set_by_regexp (self, 'setAtoms')
+ lldbutil.run_break_set_by_regexp(self, 'setAtoms')
self.runCmd("continue")
- self.expect("frame variable _cmd",substrs = ['setAtoms:'])
+ self.expect("frame variable _cmd", substrs=['setAtoms:'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/TestDataFormatterNSIndexPath.py Tue Sep 6 15:57:50 2016
@@ -6,30 +6,32 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import datetime
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class NSIndexPathDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def appkit_tester_impl(self,commands):
+ def appkit_tester_impl(self, commands):
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -38,7 +40,6 @@ class NSIndexPathDataFormatterTestCase(T
self.runCmd('type summary clear', check=False)
self.runCmd('type synth clear', check=False)
-
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
commands()
@@ -56,15 +57,58 @@ class NSIndexPathDataFormatterTestCase(T
def nsindexpath_data_formatter_commands(self):
# check 'frame variable'
- self.expect('frame variable --ptr-depth=1 -d run -- indexPath1', substrs = ['[0] = 1'])
- self.expect('frame variable --ptr-depth=1 -d run -- indexPath2', substrs = ['[0] = 1', '[1] = 2'])
- self.expect('frame variable --ptr-depth=1 -d run -- indexPath3', substrs = ['[0] = 1', '[1] = 2', '[2] = 3'])
- self.expect('frame variable --ptr-depth=1 -d run -- indexPath4', substrs = ['[0] = 1', '[1] = 2', '[2] = 3', '[3] = 4'])
- self.expect('frame variable --ptr-depth=1 -d run -- indexPath5', substrs = ['[0] = 1', '[1] = 2', '[2] = 3', '[3] = 4', '[4] = 5'])
-
+ self.expect(
+ 'frame variable --ptr-depth=1 -d run -- indexPath1',
+ substrs=['[0] = 1'])
+ self.expect(
+ 'frame variable --ptr-depth=1 -d run -- indexPath2',
+ substrs=[
+ '[0] = 1',
+ '[1] = 2'])
+ self.expect(
+ 'frame variable --ptr-depth=1 -d run -- indexPath3',
+ substrs=[
+ '[0] = 1',
+ '[1] = 2',
+ '[2] = 3'])
+ self.expect(
+ 'frame variable --ptr-depth=1 -d run -- indexPath4',
+ substrs=[
+ '[0] = 1',
+ '[1] = 2',
+ '[2] = 3',
+ '[3] = 4'])
+ self.expect(
+ 'frame variable --ptr-depth=1 -d run -- indexPath5',
+ substrs=[
+ '[0] = 1',
+ '[1] = 2',
+ '[2] = 3',
+ '[3] = 4',
+ '[4] = 5'])
+
# and 'expression'
- self.expect('expression --ptr-depth=1 -d run -- indexPath1', substrs = ['[0] = 1'])
- self.expect('expression --ptr-depth=1 -d run -- indexPath2', substrs = ['[0] = 1', '[1] = 2'])
- self.expect('expression --ptr-depth=1 -d run -- indexPath3', substrs = ['[0] = 1', '[1] = 2', '[2] = 3'])
- self.expect('expression --ptr-depth=1 -d run -- indexPath4', substrs = ['[0] = 1', '[1] = 2', '[2] = 3', '[3] = 4'])
- self.expect('expression --ptr-depth=1 -d run -- indexPath5', substrs = ['[0] = 1', '[1] = 2', '[2] = 3', '[3] = 4', '[4] = 5'])
+ self.expect(
+ 'expression --ptr-depth=1 -d run -- indexPath1',
+ substrs=['[0] = 1'])
+ self.expect(
+ 'expression --ptr-depth=1 -d run -- indexPath2',
+ substrs=[
+ '[0] = 1',
+ '[1] = 2'])
+ self.expect(
+ 'expression --ptr-depth=1 -d run -- indexPath3',
+ substrs=[
+ '[0] = 1',
+ '[1] = 2',
+ '[2] = 3'])
+ self.expect('expression --ptr-depth=1 -d run -- indexPath4',
+ substrs=['[0] = 1', '[1] = 2', '[2] = 3', '[3] = 4'])
+ self.expect(
+ 'expression --ptr-depth=1 -d run -- indexPath5',
+ substrs=[
+ '[0] = 1',
+ '[1] = 2',
+ '[2] = 3',
+ '[3] = 4',
+ '[4] = 5'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py Tue Sep 6 15:57:50 2016
@@ -6,30 +6,32 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import datetime
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class NSStringDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def appkit_tester_impl(self,commands):
+ def appkit_tester_impl(self, commands):
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -38,7 +40,6 @@ class NSStringDataFormatterTestCase(Test
self.runCmd('type summary clear', check=False)
self.runCmd('type synth clear', check=False)
-
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
commands()
@@ -58,7 +59,6 @@ class NSStringDataFormatterTestCase(Test
"""Test formatters for NSString."""
self.appkit_tester_impl(self.nsstring_withNULs_commands)
-
def setUp(self):
# Call super's setUp().
TestBase.setUp(self)
@@ -67,42 +67,55 @@ class NSStringDataFormatterTestCase(Test
def rdar11106605_commands(self):
"""Check that Unicode characters come out of CFString summary correctly."""
- self.expect('frame variable italian', substrs = ['L\'Italia è una Repubblica democratica, fondata sul lavoro. La sovranità appartiene al popolo, che la esercita nelle forme e nei limiti della Costituzione.'])
- self.expect('frame variable french', substrs = ['Que veut cette horde d\'esclaves, De traîtres, de rois conjurés?'])
- self.expect('frame variable german', substrs = ['Ãber-Ich und aus den Ansprüchen der sozialen Umwelt'])
- self.expect('frame variable japanese', substrs = ['è²ã¯åã¸ã©æ£ãã¬ãã'])
- self.expect('frame variable hebrew', substrs = ['×××× ×××'])
+ self.expect('frame variable italian', substrs=[
+ 'L\'Italia è una Repubblica democratica, fondata sul lavoro. La sovranità appartiene al popolo, che la esercita nelle forme e nei limiti della Costituzione.'])
+ self.expect('frame variable french', substrs=[
+ 'Que veut cette horde d\'esclaves, De traîtres, de rois conjurés?'])
+ self.expect('frame variable german', substrs=[
+ 'Ãber-Ich und aus den Ansprüchen der sozialen Umwelt'])
+ self.expect('frame variable japanese', substrs=['è²ã¯åã¸ã©æ£ãã¬ãã'])
+ self.expect('frame variable hebrew', substrs=['×××× ×××'])
def nsstring_data_formatter_commands(self):
self.expect('frame variable str0 str1 str2 str3 str4 str5 str6 str8 str9 str10 str11 label1 label2 processName str12',
- substrs = ['(NSString *) str1 = ',' @"A rather short ASCII NSString object is here"',
- # '(NSString *) str0 = ',' @"255"',
- '(NSString *) str1 = ',' @"A rather short ASCII NSString object is here"',
- '(NSString *) str2 = ',' @"A rather short UTF8 NSString object is here"',
- '(NSString *) str3 = ',' @"A string made with the at sign is here"',
- '(NSString *) str4 = ',' @"This is string number 4 right here"',
- '(NSString *) str5 = ',' @"{{1, 1}, {5, 5}}"',
- '(NSString *) str6 = ',' @"1ST"',
- '(NSString *) str8 = ',' @"hasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTime',
- '(NSString *) str9 = ',' @"a very much boring task to write a string this way!!',
- '(NSString *) str10 = ',' @"This is a Unicode string Ï number 4 right here"',
- '(NSString *) str11 = ',' @"__NSCFString"',
- '(NSString *) label1 = ',' @"Process Name: "',
- '(NSString *) label2 = ',' @"Process Id: "',
- '(NSString *) str12 = ',' @"Process Name: a.out Process Id:'])
- self.expect('frame variable attrString mutableAttrString mutableGetConst',
- substrs = ['(NSAttributedString *) attrString = ',' @"hello world from foo"',
- '(NSAttributedString *) mutableAttrString = ',' @"hello world from foo"',
- '(NSString *) mutableGetConst = ',' @"foo said this string needs to be very long so much longer than whatever other string has been seen ever before by anyone of the mankind that of course this is still not long enough given what foo our friend foo our lovely dearly friend foo desired of us so i am adding more stuff here for the sake of it and for the joy of our friend who is named guess what just foo. hence, dear friend foo, stay safe, your string is now long enough to accommodate your testing need and I will make sure that if not we extend it with even more fuzzy random meaningless words pasted one after the other from a long tiresome friday evening spent working in my office. my office mate went home but I am still randomly typing just for the fun of seeing what happens of the length of a Mutable String in Cocoa if it goes beyond one byte.. so be it, dear foo"'])
+ substrs=['(NSString *) str1 = ', ' @"A rather short ASCII NSString object is here"',
+ # '(NSString *) str0 = ',' @"255"',
+ '(NSString *) str1 = ', ' @"A rather short ASCII NSString object is here"',
+ '(NSString *) str2 = ', ' @"A rather short UTF8 NSString object is here"',
+ '(NSString *) str3 = ', ' @"A string made with the at sign is here"',
+ '(NSString *) str4 = ', ' @"This is string number 4 right here"',
+ '(NSString *) str5 = ', ' @"{{1, 1}, {5, 5}}"',
+ '(NSString *) str6 = ', ' @"1ST"',
+ '(NSString *) str8 = ', ' @"hasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTimehasVeryLongExtensionThisTime',
+ '(NSString *) str9 = ', ' @"a very much boring task to write a string this way!!',
+ '(NSString *) str10 = ', ' @"This is a Unicode string Ï number 4 right here"',
+ '(NSString *) str11 = ', ' @"__NSCFString"',
+ '(NSString *) label1 = ', ' @"Process Name: "',
+ '(NSString *) label2 = ', ' @"Process Id: "',
+ '(NSString *) str12 = ', ' @"Process Name: a.out Process Id:'])
+ self.expect(
+ 'frame variable attrString mutableAttrString mutableGetConst',
+ substrs=[
+ '(NSAttributedString *) attrString = ',
+ ' @"hello world from foo"',
+ '(NSAttributedString *) mutableAttrString = ',
+ ' @"hello world from foo"',
+ '(NSString *) mutableGetConst = ',
+ ' @"foo said this string needs to be very long so much longer than whatever other string has been seen ever before by anyone of the mankind that of course this is still not long enough given what foo our friend foo our lovely dearly friend foo desired of us so i am adding more stuff here for the sake of it and for the joy of our friend who is named guess what just foo. hence, dear friend foo, stay safe, your string is now long enough to accommodate your testing need and I will make sure that if not we extend it with even more fuzzy random meaningless words pasted one after the other from a long tiresome friday evening spent working in my office. my office mate went home but I am still randomly typing just for the fun of seeing what happens of the length of a Mutable String in Cocoa if it goes beyond one byte.. so be it, dear foo"'])
- self.expect('expr -d run-target -- path',substrs = ['usr/blah/stuff'])
- self.expect('frame variable path',substrs = ['usr/blah/stuff'])
+ self.expect('expr -d run-target -- path', substrs=['usr/blah/stuff'])
+ self.expect('frame variable path', substrs=['usr/blah/stuff'])
def nsstring_withNULs_commands(self):
"""Check that the NSString formatter supports embedded NULs in the text"""
- self.expect('po strwithNULs', substrs=['a very much boring task to write'])
+ self.expect(
+ 'po strwithNULs',
+ substrs=['a very much boring task to write'])
self.expect('expr [strwithNULs length]', substrs=['54'])
- self.expect('frame variable strwithNULs', substrs=['@"a very much boring task to write\\0a string this way!!'])
- self.expect('po strwithNULs2', substrs=['a very much boring task to write'])
+ self.expect('frame variable strwithNULs', substrs=[
+ '@"a very much boring task to write\\0a string this way!!'])
+ self.expect('po strwithNULs2', substrs=[
+ 'a very much boring task to write'])
self.expect('expr [strwithNULs2 length]', substrs=['52'])
- self.expect('frame variable strwithNULs2', substrs=['@"a very much boring task to write\\0a string this way!!'])
+ self.expect('frame variable strwithNULs2', substrs=[
+ '@"a very much boring task to write\\0a string this way!!'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DataFormatterOneIsSingularTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -33,14 +34,15 @@ class DataFormatterOneIsSingularTestCase
"""Test that 1 item is not as reported as 1 items."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -54,26 +56,26 @@ class DataFormatterOneIsSingularTestCase
# Now check that we are displaying Cocoa classes correctly
self.expect('frame variable key',
- substrs = ['@"1 element"'])
+ substrs=['@"1 element"'])
self.expect('frame variable key', matching=False,
- substrs = ['1 elements'])
+ substrs=['1 elements'])
self.expect('frame variable value',
- substrs = ['@"1 element"'])
+ substrs=['@"1 element"'])
self.expect('frame variable value', matching=False,
- substrs = ['1 elements'])
+ substrs=['1 elements'])
self.expect('frame variable dict',
- substrs = ['1 key/value pair'])
+ substrs=['1 key/value pair'])
self.expect('frame variable dict', matching=False,
- substrs = ['1 key/value pairs'])
+ substrs=['1 key/value pairs'])
self.expect('frame variable imset',
- substrs = ['1 index'])
+ substrs=['1 index'])
self.expect('frame variable imset', matching=False,
- substrs = ['1 indexes'])
+ substrs=['1 indexes'])
self.expect('frame variable binheap_ref',
- substrs = ['@"1 item"'])
+ substrs=['@"1 item"'])
self.expect('frame variable binheap_ref', matching=False,
- substrs = ['1 items'])
+ substrs=['1 items'])
self.expect('frame variable immutableData',
- substrs = ['1 byte'])
+ substrs=['1 byte'])
self.expect('frame variable immutableData', matching=False,
- substrs = ['1 bytes'])
+ substrs=['1 bytes'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class PtrToArrayDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -30,14 +31,15 @@ class PtrToArrayDataFormatterTestCase(Te
"""Test that LLDB handles the clang typeclass Paren correctly."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -49,9 +51,9 @@ class PtrToArrayDataFormatterTestCase(Te
self.addTearDownHook(cleanup)
self.expect('p *(int (*)[3])foo',
- substrs = ['(int [3]) $','[0] = 1','[1] = 2','[2] = 3'])
+ substrs=['(int [3]) $', '[0] = 1', '[1] = 2', '[2] = 3'])
self.expect('p *(int (*)[3])foo', matching=False,
- substrs = ['01 00 00 00 02 00 00 00 03 00 00 00'])
+ substrs=['01 00 00 00 02 00 00 00 03 00 00 00'])
self.expect('p *(int (*)[3])foo', matching=False,
- substrs = ['0x000000030000000200000001'])
+ substrs=['0x000000030000000200000001'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py Tue Sep 6 15:57:50 2016
@@ -5,18 +5,19 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PythonSynthDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
+ @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
def test_with_run_command(self):
"""Test data formatter commands."""
self.build()
@@ -27,20 +28,22 @@ class PythonSynthDataFormatterTestCase(T
self.build()
self.rdar10960550_formatter_commands()
-
def setUp(self):
# Call super's setUp().
TestBase.setUp(self)
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- self.line2 = line_number('main.cpp', '// Set cast break point at this line.')
- self.line3 = line_number('main.cpp', '// Set second cast break point at this line.')
+ self.line2 = line_number('main.cpp',
+ '// Set cast break point at this line.')
+ self.line3 = line_number(
+ 'main.cpp', '// Set second cast break point at this line.')
def data_formatter_commands(self):
"""Test using Python synthetic children provider."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
@@ -48,8 +51,8 @@ class PythonSynthDataFormatterTestCase(T
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -64,9 +67,9 @@ class PythonSynthDataFormatterTestCase(T
# print the f00_1 variable without a synth
self.expect("frame variable f00_1",
- substrs = ['a = 1',
- 'b = 2',
- 'r = 34']);
+ substrs=['a = 1',
+ 'b = 2',
+ 'r = 34'])
# now set up the synth
self.runCmd("script from fooSynthProvider import *")
@@ -81,30 +84,32 @@ class PythonSynthDataFormatterTestCase(T
# check that we get the two real vars and the fake_a variables
self.expect("frame variable f00_1",
- substrs = ['r = 34',
- 'fake_a = %d' % fake_a_val,
- 'a = 1']);
+ substrs=['r = 34',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 1'])
# check that we do not get the extra vars
self.expect("frame variable f00_1", matching=False,
- substrs = ['b = 2']);
-
+ substrs=['b = 2'])
+
# check access to members by name
self.expect('frame variable f00_1.fake_a',
- substrs = ['%d' % fake_a_val])
-
+ substrs=['%d' % fake_a_val])
+
# check access to members by index
self.expect('frame variable f00_1[1]',
- substrs = ['%d' % fake_a_val])
-
+ substrs=['%d' % fake_a_val])
+
# put synthetic children in summary in several combinations
- self.runCmd("type summary add --summary-string \"fake_a=${svar.fake_a}\" foo")
+ self.runCmd(
+ "type summary add --summary-string \"fake_a=${svar.fake_a}\" foo")
self.expect('frame variable f00_1',
- substrs = ['fake_a=%d' % fake_a_val])
- self.runCmd("type summary add --summary-string \"fake_a=${svar[1]}\" foo")
+ substrs=['fake_a=%d' % fake_a_val])
+ self.runCmd(
+ "type summary add --summary-string \"fake_a=${svar[1]}\" foo")
self.expect('frame variable f00_1',
- substrs = ['fake_a=%d' % fake_a_val])
-
+ substrs=['fake_a=%d' % fake_a_val])
+
# clear the summary
self.runCmd("type summary delete foo")
@@ -117,9 +122,9 @@ class PythonSynthDataFormatterTestCase(T
fake_a_val = 0x00000200
self.expect("frame variable f00_1",
- substrs = ['r = 34',
- 'fake_a = %d' % fake_a_val,
- 'a = 2']);
+ substrs=['r = 34',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 2'])
# check that altering the object also alters fake_a
self.runCmd("expr f00_1.a = 280")
@@ -130,9 +135,9 @@ class PythonSynthDataFormatterTestCase(T
fake_a_val = 0x00011800
self.expect("frame variable f00_1",
- substrs = ['r = 34',
- 'fake_a = %d' % fake_a_val,
- 'a = 280']);
+ substrs=['r = 34',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 280'])
# check that expanding a pointer does the right thing
if process.GetByteOrder() == lldb.eByteOrderLittle:
@@ -141,94 +146,97 @@ class PythonSynthDataFormatterTestCase(T
fake_a_val = 0x00000c00
self.expect("frame variable --ptr-depth 1 f00_ptr",
- substrs = ['r = 45',
- 'fake_a = %d' % fake_a_val,
- 'a = 12'])
-
+ substrs=['r = 45',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 12'])
+
# now add a filter.. it should fail
self.expect("type filter add foo --child b --child j", error=True,
- substrs = ['cannot add'])
-
+ substrs=['cannot add'])
+
# we get the synth again..
self.expect('frame variable f00_1', matching=False,
- substrs = ['b = 1',
- 'j = 17'])
+ substrs=['b = 1',
+ 'j = 17'])
self.expect("frame variable --ptr-depth 1 f00_ptr",
- substrs = ['r = 45',
- 'fake_a = %d' % fake_a_val,
- 'a = 12'])
-
+ substrs=['r = 45',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 12'])
+
# now delete the synth and add the filter
self.runCmd("type synth delete foo")
self.runCmd("type filter add foo --child b --child j")
-
+
self.expect('frame variable f00_1',
- substrs = ['b = 2',
- 'j = 18'])
+ substrs=['b = 2',
+ 'j = 18'])
self.expect("frame variable --ptr-depth 1 f00_ptr", matching=False,
- substrs = ['r = 45',
- 'fake_a = %d' % fake_a_val,
- 'a = 12'])
-
+ substrs=['r = 45',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 12'])
+
# now add the synth and it should fail
self.expect("type synth add -l fooSynthProvider foo", error=True,
- substrs = ['cannot add'])
-
+ substrs=['cannot add'])
+
# check the listing
self.expect('type synth list', matching=False,
- substrs = ['foo',
- 'Python class fooSynthProvider'])
- self.expect('type filter list',
- substrs = ['foo',
- '.b',
- '.j'])
-
+ substrs=['foo',
+ 'Python class fooSynthProvider'])
+ self.expect('type filter list',
+ substrs=['foo',
+ '.b',
+ '.j'])
+
# delete the filter, add the synth
self.runCmd("type filter delete foo")
self.runCmd("type synth add -l fooSynthProvider foo")
-
+
self.expect('frame variable f00_1', matching=False,
- substrs = ['b = 2',
- 'j = 18'])
- self.expect("frame variable --ptr-depth 1 f00_ptr",
- substrs = ['r = 45',
- 'fake_a = %d' % fake_a_val,
- 'a = 12'])
+ substrs=['b = 2',
+ 'j = 18'])
+ self.expect("frame variable --ptr-depth 1 f00_ptr",
+ substrs=['r = 45',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 12'])
# check the listing
self.expect('type synth list',
- substrs = ['foo',
- 'Python class fooSynthProvider'])
+ substrs=['foo',
+ 'Python class fooSynthProvider'])
self.expect('type filter list', matching=False,
- substrs = ['foo',
- '.b',
- '.j'])
-
+ substrs=['foo',
+ '.b',
+ '.j'])
+
# delete the synth and check that we get good output
self.runCmd("type synth delete foo")
-
+
self.expect("frame variable f00_1",
- substrs = ['a = 280',
- 'b = 2',
- 'j = 18']);
+ substrs=['a = 280',
+ 'b = 2',
+ 'j = 18'])
self.expect("frame variable f00_1", matching=False,
- substrs = ['fake_a = '])
+ substrs=['fake_a = '])
def rdar10960550_formatter_commands(self):
"""Test that synthetic children persist stoppoints."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- # The second breakpoint is on a multi-line expression, so the comment can't be on the right line...
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line2, num_expected_locations=1, loc_exact=False)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line3, num_expected_locations=1, loc_exact=True)
+ # The second breakpoint is on a multi-line expression, so the comment
+ # can't be on the right line...
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line2, num_expected_locations=1, loc_exact=False)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line3, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -248,25 +256,28 @@ class PythonSynthDataFormatterTestCase(T
# but their values change correctly across stop-points - in order to do this, self.runCmd("next")
# does not work because it forces a wipe of the stack frame - this is why we are using this more contrived
# mechanism to achieve our goal of preserving test_cast as a VO
- test_cast = self.dbg.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame().FindVariable('test_cast')
+ test_cast = self.dbg.GetSelectedTarget().GetProcess(
+ ).GetSelectedThread().GetSelectedFrame().FindVariable('test_cast')
str_cast = str(test_cast)
if self.TraceOn():
- print(str_cast)
+ print(str_cast)
self.assertTrue(str_cast.find('A') != -1, 'could not find A in output')
self.assertTrue(str_cast.find('B') != -1, 'could not find B in output')
self.assertTrue(str_cast.find('C') != -1, 'could not find C in output')
self.assertTrue(str_cast.find('D') != -1, 'could not find D in output')
- self.assertTrue(str_cast.find("4 = '\\0'") != -1, 'could not find item 4 == 0')
+ self.assertTrue(
+ str_cast.find("4 = '\\0'") != -1,
+ 'could not find item 4 == 0')
self.dbg.GetSelectedTarget().GetProcess().GetSelectedThread().StepOver()
str_cast = str(test_cast)
if self.TraceOn():
- print(str_cast)
+ print(str_cast)
# we detect that all the values of the child objects have changed - but the counter-generated item
# is still fixed at 0 because it is cached - this would fail if update(self): in ftsp returned False
@@ -275,4 +286,6 @@ class PythonSynthDataFormatterTestCase(T
self.assertTrue(str_cast.find('X') != -1, 'could not find X in output')
self.assertTrue(str_cast.find('T') != -1, 'could not find T in output')
self.assertTrue(str_cast.find('F') != -1, 'could not find F in output')
- self.assertTrue(str_cast.find("4 = '\\0'") != -1, 'could not find item 4 == 0')
+ self.assertTrue(
+ str_cast.find("4 = '\\0'") != -1,
+ 'could not find item 4 == 0')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py Tue Sep 6 15:57:50 2016
@@ -1,23 +1,30 @@
import lldb
+
+
class fooSynthProvider:
- def __init__(self, valobj, dict):
- self.valobj = valobj;
- self.int_type = valobj.GetType().GetBasicType(lldb.eBasicTypeInt)
- def num_children(self):
- return 3;
- def get_child_at_index(self, index):
- if index == 0:
- child = self.valobj.GetChildMemberWithName('a');
- if index == 1:
- child = self.valobj.CreateChildAtOffset ('fake_a', 1, self.int_type);
- if index == 2:
- child = self.valobj.GetChildMemberWithName('r');
- return child;
- def get_child_index(self, name):
- if name == 'a':
- return 0;
- if name == 'fake_a':
- return 1;
- return 2;
- def update(self):
- return True
\ No newline at end of file
+
+ def __init__(self, valobj, dict):
+ self.valobj = valobj
+ self.int_type = valobj.GetType().GetBasicType(lldb.eBasicTypeInt)
+
+ def num_children(self):
+ return 3
+
+ def get_child_at_index(self, index):
+ if index == 0:
+ child = self.valobj.GetChildMemberWithName('a')
+ if index == 1:
+ child = self.valobj.CreateChildAtOffset('fake_a', 1, self.int_type)
+ if index == 2:
+ child = self.valobj.GetChildMemberWithName('r')
+ return child
+
+ def get_child_index(self, name):
+ if name == 'a':
+ return 0
+ if name == 'fake_a':
+ return 1
+ return 2
+
+ def update(self):
+ return True
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py Tue Sep 6 15:57:50 2016
@@ -2,31 +2,39 @@ import lldb
counter = 0
+
class ftsp:
- def __init__(self, valobj, dict):
- self.valobj = valobj;
- def num_children(self):
- if self.char.IsValid():
- return 5;
- return 0;
- def get_child_index(self,name):
- return 0;
- def get_child_at_index(self,index):
- if index == 0:
- return self.x.Cast(self.char)
- if index == 4:
- return self.valobj.CreateValueFromExpression(str(index),'(char)('+str(self.count)+')')
- return self.x.CreateChildAtOffset(str(index),
- index,
- self.char);
- def update(self):
- self.x = self.valobj.GetChildMemberWithName('x');
- self.char = self.valobj.GetType().GetBasicType(lldb.eBasicTypeChar)
- global counter
- self.count = counter
- counter = counter + 1
- return True # important: if we return False here, or fail to return, the test will fail
+
+ def __init__(self, valobj, dict):
+ self.valobj = valobj
+
+ def num_children(self):
+ if self.char.IsValid():
+ return 5
+ return 0
+
+ def get_child_index(self, name):
+ return 0
+
+ def get_child_at_index(self, index):
+ if index == 0:
+ return self.x.Cast(self.char)
+ if index == 4:
+ return self.valobj.CreateValueFromExpression(
+ str(index), '(char)(' + str(self.count) + ')')
+ return self.x.CreateChildAtOffset(str(index),
+ index,
+ self.char)
+
+ def update(self):
+ self.x = self.valobj.GetChildMemberWithName('x')
+ self.char = self.valobj.GetType().GetBasicType(lldb.eBasicTypeChar)
+ global counter
+ self.count = counter
+ counter = counter + 1
+ return True # important: if we return False here, or fail to return, the test will fail
+
def __lldb_init_module(debugger, dict):
- global counter
- counter = 0
\ No newline at end of file
+ global counter
+ counter = 0
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class ScriptDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -30,14 +31,15 @@ class ScriptDataFormatterTestCase(TestBa
"""Test that that file and class static variables display correctly."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -51,121 +53,133 @@ class ScriptDataFormatterTestCase(TestBa
# Set the script here to ease the formatting
script = 'a = valobj.GetChildMemberWithName(\'integer\'); a_val = a.GetValue(); str = \'Hello from Python, \' + a_val + \' time\'; return str + (\'!\' if a_val == \'1\' else \'s!\');'
- self.runCmd("type summary add i_am_cool --python-script \"%s\"" % script)
+ self.runCmd(
+ "type summary add i_am_cool --python-script \"%s\"" %
+ script)
self.expect('type summary list i_am_cool', substrs=[script])
self.expect("frame variable one",
- substrs = ['Hello from Python',
- '1 time!'])
+ substrs=['Hello from Python',
+ '1 time!'])
self.expect("frame variable two",
- substrs = ['Hello from Python',
- '4 times!'])
-
- self.runCmd("n"); # skip ahead to make values change
+ substrs=['Hello from Python',
+ '4 times!'])
+
+ self.runCmd("n") # skip ahead to make values change
self.expect("frame variable three",
- substrs = ['Hello from Python, 10 times!',
- 'Hello from Python, 4 times!'])
+ substrs=['Hello from Python, 10 times!',
+ 'Hello from Python, 4 times!'])
+
+ self.runCmd("n") # skip ahead to make values change
- self.runCmd("n"); # skip ahead to make values change
-
self.expect("frame variable two",
- substrs = ['Hello from Python',
- '1 time!'])
+ substrs=['Hello from Python',
+ '1 time!'])
script = 'a = valobj.GetChildMemberWithName(\'integer\'); a_val = a.GetValue(); str = \'int says \' + a_val; return str;'
# Check that changes in the script are immediately reflected
- self.runCmd("type summary add i_am_cool --python-script \"%s\"" % script)
+ self.runCmd(
+ "type summary add i_am_cool --python-script \"%s\"" %
+ script)
self.expect("frame variable two",
- substrs = ['int says 1'])
-
+ substrs=['int says 1'])
+
self.expect("frame variable twoptr",
- substrs = ['int says 1'])
+ substrs=['int says 1'])
# Change the summary
- self.runCmd("type summary add --summary-string \"int says ${var.integer}, and float says ${var.floating}\" i_am_cool")
+ self.runCmd(
+ "type summary add --summary-string \"int says ${var.integer}, and float says ${var.floating}\" i_am_cool")
self.expect("frame variable two",
- substrs = ['int says 1',
- 'and float says 2.71'])
+ substrs=['int says 1',
+ 'and float says 2.71'])
# Try it for pointers
self.expect("frame variable twoptr",
- substrs = ['int says 1',
- 'and float says 2.71'])
+ substrs=['int says 1',
+ 'and float says 2.71'])
# Force a failure for pointers
- self.runCmd("type summary add i_am_cool -p --python-script \"%s\"" % script)
+ self.runCmd(
+ "type summary add i_am_cool -p --python-script \"%s\"" %
+ script)
self.expect("frame variable twoptr", matching=False,
- substrs = ['and float says 2.71'])
+ substrs=['and float says 2.71'])
- script = 'return \'Python summary\'';
+ script = 'return \'Python summary\''
- self.runCmd("type summary add --name test_summary --python-script \"%s\"" % script)
+ self.runCmd(
+ "type summary add --name test_summary --python-script \"%s\"" %
+ script)
# attach the Python named summary to someone
self.expect("frame variable one --summary test_summary",
- substrs = ['Python summary'])
+ substrs=['Python summary'])
# should not bind to the type
self.expect("frame variable two", matching=False,
- substrs = ['Python summary'])
+ substrs=['Python summary'])
# and should not stick to the variable
- self.expect("frame variable one",matching=False,
- substrs = ['Python summary'])
+ self.expect("frame variable one", matching=False,
+ substrs=['Python summary'])
- self.runCmd("type summary add i_am_cool --summary-string \"Text summary\"")
+ self.runCmd(
+ "type summary add i_am_cool --summary-string \"Text summary\"")
# should be temporary only
- self.expect("frame variable one",matching=False,
- substrs = ['Python summary'])
+ self.expect("frame variable one", matching=False,
+ substrs=['Python summary'])
# use the type summary
self.expect("frame variable two",
- substrs = ['Text summary'])
+ substrs=['Text summary'])
- self.runCmd("n"); # skip ahead to make values change
+ self.runCmd("n") # skip ahead to make values change
# both should use the type summary now
self.expect("frame variable one",
- substrs = ['Text summary'])
-
+ substrs=['Text summary'])
+
self.expect("frame variable two",
- substrs = ['Text summary'])
+ substrs=['Text summary'])
# disable type summary for pointers, and make a Python regex summary
- self.runCmd("type summary add i_am_cool -p --summary-string \"Text summary\"")
+ self.runCmd(
+ "type summary add i_am_cool -p --summary-string \"Text summary\"")
self.runCmd("type summary add -x cool --python-script \"%s\"" % script)
# variables should stick to the type summary
self.expect("frame variable one",
- substrs = ['Text summary'])
+ substrs=['Text summary'])
self.expect("frame variable two",
- substrs = ['Text summary'])
+ substrs=['Text summary'])
# array and pointer should match the Python one
self.expect("frame variable twoptr",
- substrs = ['Python summary'])
-
+ substrs=['Python summary'])
+
self.expect("frame variable array",
- substrs = ['Python summary'])
+ substrs=['Python summary'])
# return pointers to the type summary
- self.runCmd("type summary add i_am_cool --summary-string \"Text summary\"")
+ self.runCmd(
+ "type summary add i_am_cool --summary-string \"Text summary\"")
self.expect("frame variable one",
- substrs = ['Text summary'])
-
+ substrs=['Text summary'])
+
self.expect("frame variable two",
- substrs = ['Text summary'])
-
+ substrs=['Text summary'])
+
self.expect("frame variable twoptr",
- substrs = ['Text summary'])
-
+ substrs=['Text summary'])
+
self.expect("frame variable array",
- substrs = ['Python summary'])
+ substrs=['Python summary'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py Tue Sep 6 15:57:50 2016
@@ -5,19 +5,24 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class SkipSummaryDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr20548 fails to build on lab.llvm.org buildbot")
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
+ @expectedFailureAll(
+ oslist=['freebsd'],
+ bugnumber="llvm.org/pr20548 fails to build on lab.llvm.org buildbot")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
def test_with_run_command(self):
"""Test data formatter commands."""
self.build()
@@ -34,15 +39,15 @@ class SkipSummaryDataFormatterTestCase(T
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
#import lldbsuite.test.lldbutil as lldbutil
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
-
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -55,122 +60,146 @@ class SkipSummaryDataFormatterTestCase(T
# Setup the summaries for this scenario
#self.runCmd("type summary add --summary-string \"${var._M_dataplus._M_p}\" std::string")
- self.runCmd("type summary add --summary-string \"Level 1\" \"DeepData_1\"")
- self.runCmd("type summary add --summary-string \"Level 2\" \"DeepData_2\" -e")
- self.runCmd("type summary add --summary-string \"Level 3\" \"DeepData_3\"")
- self.runCmd("type summary add --summary-string \"Level 4\" \"DeepData_4\"")
- self.runCmd("type summary add --summary-string \"Level 5\" \"DeepData_5\"")
-
+ self.runCmd(
+ "type summary add --summary-string \"Level 1\" \"DeepData_1\"")
+ self.runCmd(
+ "type summary add --summary-string \"Level 2\" \"DeepData_2\" -e")
+ self.runCmd(
+ "type summary add --summary-string \"Level 3\" \"DeepData_3\"")
+ self.runCmd(
+ "type summary add --summary-string \"Level 4\" \"DeepData_4\"")
+ self.runCmd(
+ "type summary add --summary-string \"Level 5\" \"DeepData_5\"")
+
# Default case, just print out summaries
self.expect('frame variable',
- substrs = ['(DeepData_1) data1 = Level 1',
- '(DeepData_2) data2 = Level 2 {',
- 'm_child1 = Level 3',
- 'm_child2 = Level 3',
- 'm_child3 = Level 3',
- 'm_child4 = Level 3',
- '}'])
+ substrs=['(DeepData_1) data1 = Level 1',
+ '(DeepData_2) data2 = Level 2 {',
+ 'm_child1 = Level 3',
+ 'm_child2 = Level 3',
+ 'm_child3 = Level 3',
+ 'm_child4 = Level 3',
+ '}'])
# Skip the default (should be 1) levels of summaries
self.expect('frame variable --no-summary-depth',
- substrs = ['(DeepData_1) data1 = {',
- 'm_child1 = 0x',
- '}',
- '(DeepData_2) data2 = {',
- 'm_child1 = Level 3',
- 'm_child2 = Level 3',
- 'm_child3 = Level 3',
- 'm_child4 = Level 3',
- '}'])
+ substrs=['(DeepData_1) data1 = {',
+ 'm_child1 = 0x',
+ '}',
+ '(DeepData_2) data2 = {',
+ 'm_child1 = Level 3',
+ 'm_child2 = Level 3',
+ 'm_child3 = Level 3',
+ 'm_child4 = Level 3',
+ '}'])
# Now skip 2 levels of summaries
self.expect('frame variable --no-summary-depth=2',
- substrs = ['(DeepData_1) data1 = {',
- 'm_child1 = 0x',
- '}',
- '(DeepData_2) data2 = {',
- 'm_child1 = {',
- 'm_child1 = 0x',
- 'Level 4',
- 'm_child2 = {',
- 'm_child3 = {',
- '}'])
+ substrs=['(DeepData_1) data1 = {',
+ 'm_child1 = 0x',
+ '}',
+ '(DeepData_2) data2 = {',
+ 'm_child1 = {',
+ 'm_child1 = 0x',
+ 'Level 4',
+ 'm_child2 = {',
+ 'm_child3 = {',
+ '}'])
# Check that no "Level 3" comes out
- self.expect('frame variable data1.m_child1 --no-summary-depth=2', matching=False,
- substrs = ['Level 3'])
+ self.expect(
+ 'frame variable data1.m_child1 --no-summary-depth=2',
+ matching=False,
+ substrs=['Level 3'])
# Now expand a pointer with 2 level of skipped summaries
self.expect('frame variable data1.m_child1 --no-summary-depth=2',
- substrs = ['(DeepData_2 *) data1.m_child1 = 0x'])
+ substrs=['(DeepData_2 *) data1.m_child1 = 0x'])
# Deref and expand said pointer
self.expect('frame variable *data1.m_child1 --no-summary-depth=2',
- substrs = ['(DeepData_2) *data1.m_child1 = {',
- 'm_child2 = {',
- 'm_child1 = 0x',
- 'Level 4',
- '}'])
+ substrs=['(DeepData_2) *data1.m_child1 = {',
+ 'm_child2 = {',
+ 'm_child1 = 0x',
+ 'Level 4',
+ '}'])
# Expand an expression, skipping 2 layers of summaries
- self.expect('frame variable data1.m_child1->m_child2 --no-summary-depth=2',
- substrs = ['(DeepData_3) data1.m_child1->m_child2 = {',
- 'm_child2 = {',
- 'm_child1 = Level 5',
- 'm_child2 = Level 5',
- 'm_child3 = Level 5',
- '}'])
+ self.expect(
+ 'frame variable data1.m_child1->m_child2 --no-summary-depth=2',
+ substrs=[
+ '(DeepData_3) data1.m_child1->m_child2 = {',
+ 'm_child2 = {',
+ 'm_child1 = Level 5',
+ 'm_child2 = Level 5',
+ 'm_child3 = Level 5',
+ '}'])
# Expand same expression, skipping only 1 layer of summaries
- self.expect('frame variable data1.m_child1->m_child2 --no-summary-depth=1',
- substrs = ['(DeepData_3) data1.m_child1->m_child2 = {',
- 'm_child1 = 0x',
- 'Level 4',
- 'm_child2 = Level 4',
- '}'])
+ self.expect(
+ 'frame variable data1.m_child1->m_child2 --no-summary-depth=1',
+ substrs=[
+ '(DeepData_3) data1.m_child1->m_child2 = {',
+ 'm_child1 = 0x',
+ 'Level 4',
+ 'm_child2 = Level 4',
+ '}'])
# Bad debugging info on SnowLeopard gcc (Apple Inc. build 5666).
# Skip the following tests if the condition is met.
if self.getCompiler().endswith('gcc') and not self.getCompiler().endswith('llvm-gcc'):
- import re
- gcc_version_output = system([[lldbutil.which(self.getCompiler()), "-v"]])[1]
- #print("my output:", gcc_version_output)
- for line in gcc_version_output.split(os.linesep):
- m = re.search('\(Apple Inc\. build ([0-9]+)\)', line)
- #print("line:", line)
- if m:
- gcc_build = int(m.group(1))
- #print("gcc build:", gcc_build)
- if gcc_build >= 5666:
- # rdar://problem/9804600"
- self.skipTest("rdar://problem/9804600 wrong namespace for std::string in debug info")
+ import re
+ gcc_version_output = system(
+ [[lldbutil.which(self.getCompiler()), "-v"]])[1]
+ #print("my output:", gcc_version_output)
+ for line in gcc_version_output.split(os.linesep):
+ m = re.search('\(Apple Inc\. build ([0-9]+)\)', line)
+ #print("line:", line)
+ if m:
+ gcc_build = int(m.group(1))
+ #print("gcc build:", gcc_build)
+ if gcc_build >= 5666:
+ # rdar://problem/9804600"
+ self.skipTest(
+ "rdar://problem/9804600 wrong namespace for std::string in debug info")
# Expand same expression, skipping 3 layers of summaries
- self.expect('frame variable data1.m_child1->m_child2 --show-types --no-summary-depth=3',
- substrs = ['(DeepData_3) data1.m_child1->m_child2 = {',
- 'm_some_text = "Just a test"',
- 'm_child2 = {',
- 'm_some_text = "Just a test"'])
-
- # Expand within a standard string (might depend on the implementation of the C++ stdlib you use)
- self.expect('frame variable data1.m_child1->m_child2.m_child1.m_child2 --no-summary-depth=2',
- substrs = ['(DeepData_5) data1.m_child1->m_child2.m_child1.m_child2 = {',
- 'm_some_text = {',
- '_M_dataplus = (_M_p = "Just a test")'])
+ self.expect(
+ 'frame variable data1.m_child1->m_child2 --show-types --no-summary-depth=3',
+ substrs=[
+ '(DeepData_3) data1.m_child1->m_child2 = {',
+ 'm_some_text = "Just a test"',
+ 'm_child2 = {',
+ 'm_some_text = "Just a test"'])
+
+ # Expand within a standard string (might depend on the implementation
+ # of the C++ stdlib you use)
+ self.expect(
+ 'frame variable data1.m_child1->m_child2.m_child1.m_child2 --no-summary-depth=2',
+ substrs=[
+ '(DeepData_5) data1.m_child1->m_child2.m_child1.m_child2 = {',
+ 'm_some_text = {',
+ '_M_dataplus = (_M_p = "Just a test")'])
# Repeat the above, but only skip 1 level of summaries
- self.expect('frame variable data1.m_child1->m_child2.m_child1.m_child2 --no-summary-depth=1',
- substrs = ['(DeepData_5) data1.m_child1->m_child2.m_child1.m_child2 = {',
- 'm_some_text = "Just a test"',
- '}'])
-
- # Change summary and expand, first without --no-summary-depth then with --no-summary-depth
- self.runCmd("type summary add --summary-string \"${var.m_some_text}\" DeepData_5")
-
- self.expect('fr var data2.m_child4.m_child2.m_child2',
- substrs = ['(DeepData_5) data2.m_child4.m_child2.m_child2 = "Just a test"'])
-
- self.expect('fr var data2.m_child4.m_child2.m_child2 --no-summary-depth',
- substrs = ['(DeepData_5) data2.m_child4.m_child2.m_child2 = {',
- 'm_some_text = "Just a test"',
- '}'])
+ self.expect(
+ 'frame variable data1.m_child1->m_child2.m_child1.m_child2 --no-summary-depth=1',
+ substrs=[
+ '(DeepData_5) data1.m_child1->m_child2.m_child1.m_child2 = {',
+ 'm_some_text = "Just a test"',
+ '}'])
+
+ # Change summary and expand, first without --no-summary-depth then with
+ # --no-summary-depth
+ self.runCmd(
+ "type summary add --summary-string \"${var.m_some_text}\" DeepData_5")
+
+ self.expect('fr var data2.m_child4.m_child2.m_child2', substrs=[
+ '(DeepData_5) data2.m_child4.m_child2.m_child2 = "Just a test"'])
+
+ self.expect(
+ 'fr var data2.m_child4.m_child2.m_child2 --no-summary-depth',
+ substrs=[
+ '(DeepData_5) data2.m_child4.m_child2.m_child2 = {',
+ 'm_some_text = "Just a test"',
+ '}'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py Tue Sep 6 15:57:50 2016
@@ -5,18 +5,21 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class SmartArrayDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
def test_with_run_command(self):
"""Test data formatter commands."""
self.build()
@@ -32,7 +35,8 @@ class SmartArrayDataFormatterTestCase(Te
"""Test that that file and class static variables display correctly."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
@@ -40,9 +44,9 @@ class SmartArrayDataFormatterTestCase(Te
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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():
@@ -56,338 +60,400 @@ class SmartArrayDataFormatterTestCase(Te
self.runCmd("type summary add --summary-string \"${var%V}\" SomeData")
self.expect("frame variable data",
- substrs = ['SomeData @ 0x'])
+ substrs=['SomeData @ 0x'])
# ${var%s}
- self.runCmd("type summary add --summary-string \"ptr = ${var%s}\" \"char *\"")
+ self.runCmd(
+ "type summary add --summary-string \"ptr = ${var%s}\" \"char *\"")
self.expect("frame variable strptr",
- substrs = ['ptr = \"',
- 'Hello world!'])
+ substrs=['ptr = \"',
+ 'Hello world!'])
self.expect("frame variable other.strptr",
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
-
- self.runCmd("type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\"")
-
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
+
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%s}\" -x \"char \\[[0-9]+\\]\"")
+
self.expect("frame variable strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
-
+ substrs=['arr = \"',
+ 'Hello world!'])
+
self.expect("frame variable other.strarr",
- substrs = ['arr = \"',
- 'Nested Hello world!'])
+ substrs=['arr = \"',
+ 'Nested Hello world!'])
self.expect("p strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
+ substrs=['arr = \"',
+ 'Hello world!'])
self.expect("p other.strarr",
- substrs = ['arr = \"',
- 'Nested Hello world!'])
+ substrs=['arr = \"',
+ 'Nested Hello world!'])
# ${var%c}
- self.runCmd("type summary add --summary-string \"ptr = ${var%c}\" \"char *\"")
-
+ self.runCmd(
+ "type summary add --summary-string \"ptr = ${var%c}\" \"char *\"")
+
self.expect("frame variable strptr",
- substrs = ['ptr = \"',
- 'Hello world!'])
-
+ substrs=['ptr = \"',
+ 'Hello world!'])
+
self.expect("frame variable other.strptr",
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
self.expect("p strptr",
- substrs = ['ptr = \"',
- 'Hello world!'])
+ substrs=['ptr = \"',
+ 'Hello world!'])
self.expect("p other.strptr",
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
- self.runCmd("type summary add --summary-string \"arr = ${var%c}\" -x \"char \\[[0-9]+\\]\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%c}\" -x \"char \\[[0-9]+\\]\"")
self.expect("frame variable strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
+ substrs=['arr = \"',
+ 'Hello world!'])
self.expect("frame variable other.strarr",
- substrs = ['arr = \"',
- 'Nested Hello world!'])
-
+ substrs=['arr = \"',
+ 'Nested Hello world!'])
+
self.expect("p strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
+ substrs=['arr = \"',
+ 'Hello world!'])
self.expect("p other.strarr",
- substrs = ['arr = \"',
- 'Nested Hello world!'])
+ substrs=['arr = \"',
+ 'Nested Hello world!'])
# ${var%char[]}
- self.runCmd("type summary add --summary-string \"arr = ${var%char[]}\" -x \"char \\[[0-9]+\\]\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%char[]}\" -x \"char \\[[0-9]+\\]\"")
self.expect("frame variable strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
+ substrs=['arr = \"',
+ 'Hello world!'])
self.expect("frame variable other.strarr",
- substrs = ['arr = ',
- 'Nested Hello world!'])
+ substrs=['arr = ',
+ 'Nested Hello world!'])
self.expect("p strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
+ substrs=['arr = \"',
+ 'Hello world!'])
self.expect("p other.strarr",
- substrs = ['arr = ',
- 'Nested Hello world!'])
+ substrs=['arr = ',
+ 'Nested Hello world!'])
- self.runCmd("type summary add --summary-string \"ptr = ${var%char[]}\" \"char *\"")
+ self.runCmd(
+ "type summary add --summary-string \"ptr = ${var%char[]}\" \"char *\"")
self.expect("frame variable strptr",
- substrs = ['ptr = \"',
- 'Hello world!'])
-
+ substrs=['ptr = \"',
+ 'Hello world!'])
+
self.expect("frame variable other.strptr",
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
self.expect("p strptr",
- substrs = ['ptr = \"',
- 'Hello world!'])
+ substrs=['ptr = \"',
+ 'Hello world!'])
self.expect("p other.strptr",
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
# ${var%a}
- self.runCmd("type summary add --summary-string \"arr = ${var%a}\" -x \"char \\[[0-9]+\\]\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%a}\" -x \"char \\[[0-9]+\\]\"")
self.expect("frame variable strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
+ substrs=['arr = \"',
+ 'Hello world!'])
self.expect("frame variable other.strarr",
- substrs = ['arr = ',
- 'Nested Hello world!'])
+ substrs=['arr = ',
+ 'Nested Hello world!'])
self.expect("p strarr",
- substrs = ['arr = \"',
- 'Hello world!'])
+ substrs=['arr = \"',
+ 'Hello world!'])
self.expect("p other.strarr",
- substrs = ['arr = ',
- 'Nested Hello world!'])
+ substrs=['arr = ',
+ 'Nested Hello world!'])
- self.runCmd("type summary add --summary-string \"ptr = ${var%a}\" \"char *\"")
+ self.runCmd(
+ "type summary add --summary-string \"ptr = ${var%a}\" \"char *\"")
self.expect("frame variable strptr",
- substrs = ['ptr = \"',
- 'Hello world!'])
+ substrs=['ptr = \"',
+ 'Hello world!'])
self.expect("frame variable other.strptr",
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
self.expect("p strptr",
- substrs = ['ptr = \"',
- 'Hello world!'])
+ substrs=['ptr = \"',
+ 'Hello world!'])
self.expect("p other.strptr",
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
+
+ self.runCmd(
+ "type summary add --summary-string \"ptr = ${var[]%char[]}\" \"char *\"")
- self.runCmd("type summary add --summary-string \"ptr = ${var[]%char[]}\" \"char *\"")
-
# I do not know the size of the data, but you are asking for a full array slice..
# use the ${var%char[]} to obtain a string as result
self.expect("frame variable strptr", matching=False,
- substrs = ['ptr = \"',
- 'Hello world!'])
-
+ substrs=['ptr = \"',
+ 'Hello world!'])
+
self.expect("frame variable other.strptr", matching=False,
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
self.expect("p strptr", matching=False,
- substrs = ['ptr = \"',
- 'Hello world!'])
+ substrs=['ptr = \"',
+ 'Hello world!'])
self.expect("p other.strptr", matching=False,
- substrs = ['ptr = \"',
- 'Nested Hello world!'])
+ substrs=['ptr = \"',
+ 'Nested Hello world!'])
# You asked an array-style printout...
- self.runCmd("type summary add --summary-string \"ptr = ${var[0-1]%char[]}\" \"char *\"")
-
+ self.runCmd(
+ "type summary add --summary-string \"ptr = ${var[0-1]%char[]}\" \"char *\"")
+
self.expect("frame variable strptr",
- substrs = ['ptr = ',
- '[{H},{e}]'])
-
+ substrs=['ptr = ',
+ '[{H},{e}]'])
+
self.expect("frame variable other.strptr",
- substrs = ['ptr = ',
- '[{N},{e}]'])
+ substrs=['ptr = ',
+ '[{N},{e}]'])
self.expect("p strptr",
- substrs = ['ptr = ',
- '[{H},{e}]'])
+ substrs=['ptr = ',
+ '[{H},{e}]'])
self.expect("p other.strptr",
- substrs = ['ptr = ',
- '[{N},{e}]'])
+ substrs=['ptr = ',
+ '[{N},{e}]'])
# using [] is required here
- self.runCmd("type summary add --summary-string \"arr = ${var%x}\" \"int [5]\"")
-
- self.expect("frame variable intarr",matching=False,
- substrs = ['0x00000001,0x00000001,0x00000002,0x00000003,0x00000005'])
-
- self.expect("frame variable other.intarr", matching=False,
- substrs = ['0x00000009,0x00000008,0x00000007,0x00000006,0x00000005'])
-
- self.runCmd("type summary add --summary-string \"arr = ${var[]%x}\" \"int [5]\"")
-
- self.expect("frame variable intarr",
- substrs = ['intarr = arr =',
- '0x00000001,0x00000001,0x00000002,0x00000003,0x00000005'])
-
- self.expect("frame variable other.intarr",
- substrs = ['intarr = arr =',
- '0x00000009,0x00000008,0x00000007,0x00000006,0x00000005'])
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%x}\" \"int [5]\"")
+
+ self.expect("frame variable intarr", matching=False, substrs=[
+ '0x00000001,0x00000001,0x00000002,0x00000003,0x00000005'])
+
+ self.expect("frame variable other.intarr", matching=False, substrs=[
+ '0x00000009,0x00000008,0x00000007,0x00000006,0x00000005'])
+
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var[]%x}\" \"int [5]\"")
+
+ self.expect(
+ "frame variable intarr",
+ substrs=[
+ 'intarr = arr =',
+ '0x00000001,0x00000001,0x00000002,0x00000003,0x00000005'])
+
+ self.expect(
+ "frame variable other.intarr",
+ substrs=[
+ 'intarr = arr =',
+ '0x00000009,0x00000008,0x00000007,0x00000006,0x00000005'])
# printing each array item as an array
- self.runCmd("type summary add --summary-string \"arr = ${var[]%uint32_t[]}\" \"int [5]\"")
-
- self.expect("frame variable intarr",
- substrs = ['intarr = arr =',
- '{0x00000001},{0x00000001},{0x00000002},{0x00000003},{0x00000005}'])
-
- self.expect("frame variable other.intarr",
- substrs = ['intarr = arr = ',
- '{0x00000009},{0x00000008},{0x00000007},{0x00000006},{0x00000005}'])
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var[]%uint32_t[]}\" \"int [5]\"")
+
+ self.expect(
+ "frame variable intarr",
+ substrs=[
+ 'intarr = arr =',
+ '{0x00000001},{0x00000001},{0x00000002},{0x00000003},{0x00000005}'])
+
+ self.expect(
+ "frame variable other.intarr",
+ substrs=[
+ 'intarr = arr = ',
+ '{0x00000009},{0x00000008},{0x00000007},{0x00000006},{0x00000005}'])
# printing full array as an array
- self.runCmd("type summary add --summary-string \"arr = ${var%uint32_t[]}\" \"int [5]\"")
-
- self.expect("frame variable intarr",
- substrs = ['intarr = arr =',
- '0x00000001,0x00000001,0x00000002,0x00000003,0x00000005'])
-
- self.expect("frame variable other.intarr",
- substrs = ['intarr = arr =',
- '0x00000009,0x00000008,0x00000007,0x00000006,0x00000005'])
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%uint32_t[]}\" \"int [5]\"")
+
+ self.expect(
+ "frame variable intarr",
+ substrs=[
+ 'intarr = arr =',
+ '0x00000001,0x00000001,0x00000002,0x00000003,0x00000005'])
+
+ self.expect(
+ "frame variable other.intarr",
+ substrs=[
+ 'intarr = arr =',
+ '0x00000009,0x00000008,0x00000007,0x00000006,0x00000005'])
# printing each array item as an array
- self.runCmd("type summary add --summary-string \"arr = ${var[]%float32[]}\" \"float [7]\"")
-
- self.expect("frame variable flarr",
- substrs = ['flarr = arr =',
- '{78.5},{77.25},{78},{76.125},{76.75},{76.875},{77}'])
-
- self.expect("frame variable other.flarr",
- substrs = ['flarr = arr = ',
- '{25.5},{25.25},{25.125},{26.75},{27.375},{27.5},{26.125}'])
-
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var[]%float32[]}\" \"float [7]\"")
+
+ self.expect(
+ "frame variable flarr",
+ substrs=[
+ 'flarr = arr =',
+ '{78.5},{77.25},{78},{76.125},{76.75},{76.875},{77}'])
+
+ self.expect(
+ "frame variable other.flarr",
+ substrs=[
+ 'flarr = arr = ',
+ '{25.5},{25.25},{25.125},{26.75},{27.375},{27.5},{26.125}'])
+
# printing full array as an array
- self.runCmd("type summary add --summary-string \"arr = ${var%float32[]}\" \"float [7]\"")
-
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%float32[]}\" \"float [7]\"")
+
self.expect("frame variable flarr",
- substrs = ['flarr = arr =',
- '78.5,77.25,78,76.125,76.75,76.875,77'])
-
+ substrs=['flarr = arr =',
+ '78.5,77.25,78,76.125,76.75,76.875,77'])
+
self.expect("frame variable other.flarr",
- substrs = ['flarr = arr =',
- '25.5,25.25,25.125,26.75,27.375,27.5,26.125'])
+ substrs=['flarr = arr =',
+ '25.5,25.25,25.125,26.75,27.375,27.5,26.125'])
# using array smart summary strings for pointers should make no sense
- self.runCmd("type summary add --summary-string \"arr = ${var%float32[]}\" \"float *\"")
- self.runCmd("type summary add --summary-string \"arr = ${var%int32_t[]}\" \"int *\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%float32[]}\" \"float *\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%int32_t[]}\" \"int *\"")
self.expect("frame variable flptr", matching=False,
- substrs = ['78.5,77.25,78,76.125,76.75,76.875,77'])
-
+ substrs=['78.5,77.25,78,76.125,76.75,76.875,77'])
+
self.expect("frame variable intptr", matching=False,
- substrs = ['1,1,2,3,5'])
+ substrs=['1,1,2,3,5'])
# use y and Y
- self.runCmd("type summary add --summary-string \"arr = ${var%y}\" \"float [7]\"")
- self.runCmd("type summary add --summary-string \"arr = ${var%y}\" \"int [5]\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%y}\" \"float [7]\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%y}\" \"int [5]\"")
if process.GetByteOrder() == lldb.eByteOrderLittle:
- self.expect("frame variable flarr",
- substrs = ['flarr = arr =',
- '00 00 9d 42,00 80 9a 42,00 00 9c 42,00 40 98 42,00 80 99 42,00 c0 99 42,00 00 9a 42'])
+ self.expect(
+ "frame variable flarr",
+ substrs=[
+ 'flarr = arr =',
+ '00 00 9d 42,00 80 9a 42,00 00 9c 42,00 40 98 42,00 80 99 42,00 c0 99 42,00 00 9a 42'])
else:
- self.expect("frame variable flarr",
- substrs = ['flarr = arr =',
- '42 9d 00 00,42 9a 80 00,42 9c 00 00,42 98 40 00,42 99 80 00,42 99 c0 00,42 9a 00 00'])
+ self.expect(
+ "frame variable flarr",
+ substrs=[
+ 'flarr = arr =',
+ '42 9d 00 00,42 9a 80 00,42 9c 00 00,42 98 40 00,42 99 80 00,42 99 c0 00,42 9a 00 00'])
if process.GetByteOrder() == lldb.eByteOrderLittle:
- self.expect("frame variable other.flarr",
- substrs = ['flarr = arr =',
- '00 00 cc 41,00 00 ca 41,00 00 c9 41,00 00 d6 41,00 00 db 41,00 00 dc 41,00 00 d1 41'])
+ self.expect(
+ "frame variable other.flarr",
+ substrs=[
+ 'flarr = arr =',
+ '00 00 cc 41,00 00 ca 41,00 00 c9 41,00 00 d6 41,00 00 db 41,00 00 dc 41,00 00 d1 41'])
else:
- self.expect("frame variable other.flarr",
- substrs = ['flarr = arr =',
- '41 cc 00 00,41 ca 00 00,41 c9 00 00,41 d6 00 00,41 db 00 00,41 dc 00 00,41 d1 00 00'])
+ self.expect(
+ "frame variable other.flarr",
+ substrs=[
+ 'flarr = arr =',
+ '41 cc 00 00,41 ca 00 00,41 c9 00 00,41 d6 00 00,41 db 00 00,41 dc 00 00,41 d1 00 00'])
if process.GetByteOrder() == lldb.eByteOrderLittle:
- self.expect("frame variable intarr",
- substrs = ['intarr = arr =',
- '01 00 00 00,01 00 00 00,02 00 00 00,03 00 00 00,05 00 00 00'])
+ self.expect(
+ "frame variable intarr",
+ substrs=[
+ 'intarr = arr =',
+ '01 00 00 00,01 00 00 00,02 00 00 00,03 00 00 00,05 00 00 00'])
else:
- self.expect("frame variable intarr",
- substrs = ['intarr = arr =',
- '00 00 00 01,00 00 00 01,00 00 00 02,00 00 00 03,00 00 00 05'])
+ self.expect(
+ "frame variable intarr",
+ substrs=[
+ 'intarr = arr =',
+ '00 00 00 01,00 00 00 01,00 00 00 02,00 00 00 03,00 00 00 05'])
if process.GetByteOrder() == lldb.eByteOrderLittle:
- self.expect("frame variable other.intarr",
- substrs = ['intarr = arr = ',
- '09 00 00 00,08 00 00 00,07 00 00 00,06 00 00 00,05 00 00 00'])
+ self.expect(
+ "frame variable other.intarr",
+ substrs=[
+ 'intarr = arr = ',
+ '09 00 00 00,08 00 00 00,07 00 00 00,06 00 00 00,05 00 00 00'])
else:
- self.expect("frame variable other.intarr",
- substrs = ['intarr = arr = ',
- '00 00 00 09,00 00 00 08,00 00 00 07,00 00 00 06,00 00 00 05'])
-
- self.runCmd("type summary add --summary-string \"arr = ${var%Y}\" \"float [7]\"")
- self.runCmd("type summary add --summary-string \"arr = ${var%Y}\" \"int [5]\"")
-
+ self.expect(
+ "frame variable other.intarr",
+ substrs=[
+ 'intarr = arr = ',
+ '00 00 00 09,00 00 00 08,00 00 00 07,00 00 00 06,00 00 00 05'])
+
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%Y}\" \"float [7]\"")
+ self.runCmd(
+ "type summary add --summary-string \"arr = ${var%Y}\" \"int [5]\"")
+
if process.GetByteOrder() == lldb.eByteOrderLittle:
- self.expect("frame variable flarr",
- substrs = ['flarr = arr =',
- '00 00 9d 42 ...B,00 80 9a 42 ...B,00 00 9c 42 ...B,00 40 98 42 . at .B,00 80 99 42 ...B,00 c0 99 42 ...B,00 00 9a 42 ...B'])
+ self.expect(
+ "frame variable flarr",
+ substrs=[
+ 'flarr = arr =',
+ '00 00 9d 42 ...B,00 80 9a 42 ...B,00 00 9c 42 ...B,00 40 98 42 . at .B,00 80 99 42 ...B,00 c0 99 42 ...B,00 00 9a 42 ...B'])
else:
- self.expect("frame variable flarr",
- substrs = ['flarr = arr =',
- '42 9d 00 00 B...,42 9a 80 00 B...,42 9c 00 00 B...,42 98 40 00 B. at .,42 99 80 00 B...,42 99 c0 00 B...,42 9a 00 00 B...'])
+ self.expect(
+ "frame variable flarr",
+ substrs=[
+ 'flarr = arr =',
+ '42 9d 00 00 B...,42 9a 80 00 B...,42 9c 00 00 B...,42 98 40 00 B. at .,42 99 80 00 B...,42 99 c0 00 B...,42 9a 00 00 B...'])
if process.GetByteOrder() == lldb.eByteOrderLittle:
- self.expect("frame variable other.flarr",
- substrs = ['flarr = arr =',
- '00 00 cc 41 ...A,00 00 ca 41 ...A,00 00 c9 41 ...A,00 00 d6 41 ...A,00 00 db 41 ...A,00 00 dc 41 ...A,00 00 d1 41 ...A'])
+ self.expect(
+ "frame variable other.flarr",
+ substrs=[
+ 'flarr = arr =',
+ '00 00 cc 41 ...A,00 00 ca 41 ...A,00 00 c9 41 ...A,00 00 d6 41 ...A,00 00 db 41 ...A,00 00 dc 41 ...A,00 00 d1 41 ...A'])
else:
- self.expect("frame variable other.flarr",
- substrs = ['flarr = arr =',
- '41 cc 00 00 A...,41 ca 00 00 A...,41 c9 00 00 A...,41 d6 00 00 A...,41 db 00 00 A...,41 dc 00 00 A...,41 d1 00 00 A...'])
+ self.expect(
+ "frame variable other.flarr",
+ substrs=[
+ 'flarr = arr =',
+ '41 cc 00 00 A...,41 ca 00 00 A...,41 c9 00 00 A...,41 d6 00 00 A...,41 db 00 00 A...,41 dc 00 00 A...,41 d1 00 00 A...'])
if process.GetByteOrder() == lldb.eByteOrderLittle:
self.expect("frame variable intarr",
- substrs = ['intarr = arr =',
- '....,01 00 00 00',
- '....,05 00 00 00'])
+ substrs=['intarr = arr =',
+ '....,01 00 00 00',
+ '....,05 00 00 00'])
else:
self.expect("frame variable intarr",
- substrs = ['intarr = arr =',
- '....,00 00 00 01',
- '....,00 00 00 05'])
+ substrs=['intarr = arr =',
+ '....,00 00 00 01',
+ '....,00 00 00 05'])
if process.GetByteOrder() == lldb.eByteOrderLittle:
self.expect("frame variable other.intarr",
- substrs = ['intarr = arr = ',
- '09 00 00 00',
- '....,07 00 00 00'])
+ substrs=['intarr = arr = ',
+ '09 00 00 00',
+ '....,07 00 00 00'])
else:
self.expect("frame variable other.intarr",
- substrs = ['intarr = arr = ',
- '00 00 00 09',
- '....,00 00 00 07'])
+ substrs=['intarr = arr = ',
+ '00 00 00 09',
+ '....,00 00 00 07'])
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=280751&r1=280750&r2=280751&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 Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibCxxAtomicTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,30 +24,39 @@ class LibCxxAtomicTestCase(TestBase):
return var
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
def test(self):
"""Test that std::atomic as defined by libc++ is correctly printed by LLDB"""
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\+\+"))
+ 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'])
-
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
+
s = self.get_variable('s')
i = self.get_variable('i')
-
- if self.TraceOn(): print(s)
- if self.TraceOn(): print(i)
-
+
+ if self.TraceOn():
+ print(s)
+ if self.TraceOn():
+ print(i)
+
self.assertTrue(i.GetValueAsUnsigned(0) == 5, "i == 5")
self.assertTrue(s.GetNumChildren() == 2, "s has two children")
- self.assertTrue(s.GetChildAtIndex(0).GetValueAsUnsigned(0) == 1, "s.x == 1")
- self.assertTrue(s.GetChildAtIndex(1).GetValueAsUnsigned(0) == 2, "s.y == 2")
+ self.assertTrue(
+ s.GetChildAtIndex(0).GetValueAsUnsigned(0) == 1,
+ "s.x == 1")
+ self.assertTrue(
+ s.GetChildAtIndex(1).GetValueAsUnsigned(0) == 2,
+ "s.y == 2")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/TestLibCxxFunction.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibCxxFunctionTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,28 +24,33 @@ class LibCxxFunctionTestCase(TestBase):
return var
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
def test(self):
"""Test that std::function as defined by libc++ is correctly printed by LLDB"""
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\+\+"))
+ 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'])
-
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
+
f1 = self.get_variable('f1')
f2 = self.get_variable('f2')
-
- if self.TraceOn(): print(f1)
- if self.TraceOn(): print(f2)
-
+
+ if self.TraceOn():
+ print(f1)
+ if self.TraceOn():
+ print(f2)
+
self.assertTrue(f1.GetValueAsUnsigned(0) != 0, 'f1 has a valid value')
self.assertTrue(f2.GetValueAsUnsigned(0) != 0, 'f2 has a valid value')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py Tue Sep 6 15:57:50 2016
@@ -5,37 +5,44 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class InitializerListTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
@skipIf(compiler="gcc")
- @expectedFailureAll(oslist=["linux"], bugnumber="fails on clang 3.5 and tot")
+ @expectedFailureAll(
+ oslist=["linux"],
+ bugnumber="fails on clang 3.5 and tot")
def test(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\+\+"))
+ 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'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
- self.expect("frame variable ili", substrs = ['[1] = 2','[4] = 5'])
- self.expect("frame variable ils", substrs = ['[4] = "surprise it is a long string!! yay!!"'])
+ self.expect("frame variable ili", substrs=['[1] = 2', '[4] = 5'])
+ self.expect("frame variable ils", substrs=[
+ '[4] = "surprise it is a long string!! yay!!"'])
- self.expect('image list', substrs = self.getLibcPlusPlusLibs())
+ self.expect('image list', substrs=self.getLibcPlusPlusLibs())
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxIteratorDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,22 +24,24 @@ class LibcxxIteratorDataFormatterTestCas
self.line = line_number('main.cpp', '// Set break point at this line.')
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
def test_with_run_command(self):
"""Test that libc++ iterators format properly."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
- lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
+ 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'])
+ 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.
@@ -47,21 +50,31 @@ class LibcxxIteratorDataFormatterTestCas
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)
+ 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 ivI', substrs = ['item = 3'])
- self.expect('expr ivI', substrs = ['item = 3'])
+ self.expect('image list', substrs=self.getLibcPlusPlusLibs())
- self.expect('frame variable iimI', substrs = ['first = 0','second = 12'])
- self.expect('expr iimI', substrs = ['first = 0','second = 12'])
+ self.expect('frame variable ivI', substrs=['item = 3'])
+ self.expect('expr ivI', substrs=['item = 3'])
- self.expect('frame variable simI', substrs = ['first = "world"','second = 42'])
- self.expect('expr simI', substrs = ['first = "world"','second = 42'])
+ self.expect(
+ 'frame variable iimI',
+ substrs=[
+ 'first = 0',
+ 'second = 12'])
+ self.expect('expr iimI', substrs=['first = 0', 'second = 12'])
+
+ self.expect(
+ 'frame variable simI',
+ substrs=[
+ 'first = "world"',
+ 'second = 42'])
+ self.expect('expr simI', substrs=['first = "world"', 'second = 42'])
- self.expect('frame variable svI', substrs = ['item = "hello"'])
- self.expect('expr svI', substrs = ['item = "hello"'])
+ self.expect('frame variable svI', substrs=['item = "hello"'])
+ self.expect('expr svI', substrs=['item = "hello"'])
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=280751&r1=280750&r2=280751&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 Tue Sep 6 15:57:50 2016
@@ -5,13 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time, re
+import os
+import time
+import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxListDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,31 +23,39 @@ class LibcxxListDataFormatterTestCase(Te
TestBase.setUp(self)
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- self.line2 = line_number('main.cpp', '// Set second break point at this line.')
- self.line3 = line_number('main.cpp', '// Set third break point at this line.')
- self.line4 = line_number('main.cpp', '// Set fourth break point at this line.')
+ self.line2 = line_number('main.cpp',
+ '// Set second break point at this line.')
+ self.line3 = line_number('main.cpp',
+ '// Set third break point at this line.')
+ self.line4 = line_number('main.cpp',
+ '// Set fourth break point at this line.')
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
@expectedFailureAll(oslist=["macosx"], bugnumber="rdar://25499635")
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)
-
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line2, num_expected_locations=-1)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line3, num_expected_locations=-1)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line4, num_expected_locations=-1)
+
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line2, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line3, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line4, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
- lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
+ 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'])
+ 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.
@@ -54,135 +64,154 @@ class LibcxxListDataFormatterTestCase(Te
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)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
self.runCmd("frame variable numbers_list --show-types")
- self.runCmd("type summary add std::int_list std::string_list int_list string_list --summary-string \"list has ${svar%#} items\" -e")
+ self.runCmd(
+ "type summary add std::int_list std::string_list int_list string_list --summary-string \"list has ${svar%#} items\" -e")
self.runCmd("type format add -f hex int")
self.expect("frame variable numbers_list --raw", matching=False,
- substrs = ['list has 0 items',
- '{}'])
+ substrs=['list has 0 items',
+ '{}'])
self.expect("frame variable numbers_list",
- substrs = ['list has 0 items',
- '{}'])
+ substrs=['list has 0 items',
+ '{}'])
self.expect("p numbers_list",
- substrs = ['list has 0 items',
- '{}'])
+ substrs=['list has 0 items',
+ '{}'])
self.runCmd("n")
self.expect("frame variable numbers_list",
- substrs = ['list has 1 items',
- '[0] = ',
- '0x12345678'])
+ substrs=['list has 1 items',
+ '[0] = ',
+ '0x12345678'])
- self.runCmd("n");self.runCmd("n");self.runCmd("n");
+ self.runCmd("n")
+ self.runCmd("n")
+ self.runCmd("n")
self.expect("frame variable numbers_list",
- substrs = ['list has 4 items',
- '[0] = ',
- '0x12345678',
- '[1] =',
- '0x11223344',
- '[2] =',
- '0xbeeffeed',
- '[3] =',
- '0x00abba00'])
+ substrs=['list has 4 items',
+ '[0] = ',
+ '0x12345678',
+ '[1] =',
+ '0x11223344',
+ '[2] =',
+ '0xbeeffeed',
+ '[3] =',
+ '0x00abba00'])
- self.runCmd("n");self.runCmd("n");
+ self.runCmd("n")
+ self.runCmd("n")
self.expect("frame variable numbers_list",
- substrs = ['list has 6 items',
- '[0] = ',
- '0x12345678',
- '0x11223344',
- '0xbeeffeed',
- '0x00abba00',
- '[4] =',
- '0x0abcdef0',
- '[5] =',
- '0x0cab0cab'])
+ substrs=['list has 6 items',
+ '[0] = ',
+ '0x12345678',
+ '0x11223344',
+ '0xbeeffeed',
+ '0x00abba00',
+ '[4] =',
+ '0x0abcdef0',
+ '[5] =',
+ '0x0cab0cab'])
self.expect("p numbers_list",
- substrs = ['list has 6 items',
- '[0] = ',
- '0x12345678',
- '0x11223344',
- '0xbeeffeed',
- '0x00abba00',
- '[4] =',
- '0x0abcdef0',
- '[5] =',
- '0x0cab0cab'])
+ substrs=['list has 6 items',
+ '[0] = ',
+ '0x12345678',
+ '0x11223344',
+ '0xbeeffeed',
+ '0x00abba00',
+ '[4] =',
+ '0x0abcdef0',
+ '[5] =',
+ '0x0cab0cab'])
# check access-by-index
self.expect("frame variable numbers_list[0]",
- substrs = ['0x12345678']);
+ substrs=['0x12345678'])
self.expect("frame variable numbers_list[1]",
- substrs = ['0x11223344']);
+ substrs=['0x11223344'])
self.runCmd("n")
-
+
self.expect("frame variable numbers_list",
- substrs = ['list has 0 items',
- '{}'])
+ substrs=['list has 0 items',
+ '{}'])
+
+ self.runCmd("n")
+ self.runCmd("n")
+ self.runCmd("n")
+ self.runCmd("n")
- self.runCmd("n");self.runCmd("n");self.runCmd("n");self.runCmd("n");
-
self.expect("frame variable numbers_list",
- substrs = ['list has 4 items',
- '[0] = ', '1',
- '[1] = ', '2',
- '[2] = ', '3',
- '[3] = ', '4'])
+ substrs=['list has 4 items',
+ '[0] = ', '1',
+ '[1] = ', '2',
+ '[2] = ', '3',
+ '[3] = ', '4'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("numbers_list").MightHaveChildren(), "numbers_list.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("numbers_list").MightHaveChildren(),
+ "numbers_list.MightHaveChildren() says False for non empty!")
self.runCmd("type format delete int")
self.runCmd("c")
self.expect("frame variable text_list",
- substrs = ['list has 3 items',
- '[0]', 'goofy',
- '[1]', 'is',
- '[2]', 'smart'])
+ substrs=['list has 3 items',
+ '[0]', 'goofy',
+ '[1]', 'is',
+ '[2]', 'smart'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("text_list").MightHaveChildren(), "text_list.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("text_list").MightHaveChildren(),
+ "text_list.MightHaveChildren() says False for non empty!")
self.expect("p text_list",
- substrs = ['list has 3 items',
- '\"goofy\"',
- '\"is\"',
- '\"smart\"'])
-
+ substrs=['list has 3 items',
+ '\"goofy\"',
+ '\"is\"',
+ '\"smart\"'])
+
self.runCmd("n")
# check access-by-index
self.expect("frame variable text_list[0]",
- substrs = ['goofy']);
+ substrs=['goofy'])
self.expect("frame variable text_list[3]",
- substrs = ['!!!']);
-
+ substrs=['!!!'])
+
self.runCmd("continue")
-
+
# check that the list provider correctly updates if elements move
countingList = self.frame().FindVariable("countingList")
countingList.SetPreferDynamicValue(True)
countingList.SetPreferSyntheticValue(True)
-
- self.assertTrue(countingList.GetChildAtIndex(0).GetValueAsUnsigned(0) == 3141, "list[0] == 3141")
- self.assertTrue(countingList.GetChildAtIndex(1).GetValueAsUnsigned(0) == 3141, "list[1] == 3141")
-
+
+ self.assertTrue(countingList.GetChildAtIndex(
+ 0).GetValueAsUnsigned(0) == 3141, "list[0] == 3141")
+ self.assertTrue(countingList.GetChildAtIndex(
+ 1).GetValueAsUnsigned(0) == 3141, "list[1] == 3141")
+
self.runCmd("continue")
- self.assertTrue(countingList.GetChildAtIndex(0).GetValueAsUnsigned(0) == 3141, "uniqued list[0] == 3141")
- self.assertTrue(countingList.GetChildAtIndex(1).GetValueAsUnsigned(0) == 3142, "uniqued list[1] == 3142")
+ self.assertTrue(
+ countingList.GetChildAtIndex(0).GetValueAsUnsigned(0) == 3141,
+ "uniqued list[0] == 3141")
+ self.assertTrue(
+ countingList.GetChildAtIndex(1).GetValueAsUnsigned(0) == 3142,
+ "uniqued list[1] == 3142")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py Tue Sep 6 15:57:50 2016
@@ -6,19 +6,21 @@ corruption).
from __future__ import print_function
-
-import os, time, re
+import os
+import time
+import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxListDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
@add_test_categories(["pyapi"])
@skipIfDarwin # rdar://25499635
def test_with_run_command(self):
@@ -27,29 +29,47 @@ class LibcxxListDataFormatterTestCase(Te
target = self.dbg.CreateTarget(exe)
self.assertTrue(target and target.IsValid(), "Target is valid")
- file_spec = lldb.SBFileSpec ("main.cpp", False)
- breakpoint1 = target.BreakpointCreateBySourceRegex('// Set break point at this line.', file_spec)
+ file_spec = lldb.SBFileSpec("main.cpp", False)
+ breakpoint1 = target.BreakpointCreateBySourceRegex(
+ '// Set break point at this line.', file_spec)
self.assertTrue(breakpoint1 and breakpoint1.IsValid())
- breakpoint2 = target.BreakpointCreateBySourceRegex('// Set second break point at this line.', file_spec)
+ breakpoint2 = target.BreakpointCreateBySourceRegex(
+ '// Set second break point at this line.', file_spec)
self.assertTrue(breakpoint2 and breakpoint2.IsValid())
# Run the program, it should stop at breakpoint 1.
- process = target.LaunchSimple(None, None, self.get_process_working_directory())
- lldbutil.skip_if_library_missing(self, target, lldbutil.PrintableRegex("libc\+\+"))
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
+ lldbutil.skip_if_library_missing(
+ self, target, lldbutil.PrintableRegex("libc\+\+"))
self.assertTrue(process and process.IsValid(), PROCESS_IS_VALID)
- self.assertEqual(len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint1)), 1)
+ self.assertEqual(
+ len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint1)), 1)
# verify our list is displayed correctly
- self.expect("frame variable *numbers_list", substrs=['[0] = 1', '[1] = 2', '[2] = 3', '[3] = 4', '[5] = 6'])
+ self.expect(
+ "frame variable *numbers_list",
+ substrs=[
+ '[0] = 1',
+ '[1] = 2',
+ '[2] = 3',
+ '[3] = 4',
+ '[5] = 6'])
# Continue to breakpoint 2.
process.Continue()
self.assertTrue(process and process.IsValid(), PROCESS_IS_VALID)
- self.assertEqual(len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint2)), 1)
+ self.assertEqual(
+ len(lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint2)), 1)
# The list is now inconsistent. However, we should be able to get the first three
# elements at least (and most importantly, not crash).
- self.expect("frame variable *numbers_list", substrs=['[0] = 1', '[1] = 2', '[2] = 3'])
+ self.expect(
+ "frame variable *numbers_list",
+ substrs=[
+ '[0] = 1',
+ '[1] = 2',
+ '[2] = 3'])
# Run to completion.
process.Continue()
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py Tue Sep 6 15:57:50 2016
@@ -5,34 +5,38 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxMapDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
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\+\+"))
+ 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'])
+ 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.
@@ -41,259 +45,269 @@ class LibcxxMapDataFormatterTestCase(Tes
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)
+ 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('image list', substrs=self.getLibcPlusPlusLibs())
+
self.expect('frame variable ii',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect('frame variable ii',
- substrs = ['size=2',
- '[0] = ',
- 'first = 0',
- 'second = 0',
- '[1] = ',
- 'first = 1',
- 'second = 1'])
+ substrs=['size=2',
+ '[0] = ',
+ 'first = 0',
+ 'second = 0',
+ '[1] = ',
+ 'first = 1',
+ 'second = 1'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect('frame variable ii',
- substrs = ['size=4',
- '[2] = ',
- 'first = 2',
- 'second = 0',
- '[3] = ',
- 'first = 3',
- 'second = 1'])
+ substrs=['size=4',
+ '[2] = ',
+ 'first = 2',
+ 'second = 0',
+ '[3] = ',
+ 'first = 3',
+ 'second = 1'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable ii",
- substrs = ['size=8',
- '[5] = ',
- 'first = 5',
- 'second = 0',
- '[7] = ',
- 'first = 7',
- 'second = 1'])
+ substrs=['size=8',
+ '[5] = ',
+ 'first = 5',
+ 'second = 0',
+ '[7] = ',
+ 'first = 7',
+ 'second = 1'])
self.expect("p ii",
- substrs = ['size=8',
- '[5] = ',
- 'first = 5',
- 'second = 0',
- '[7] = ',
- 'first = 7',
- 'second = 1'])
+ substrs=['size=8',
+ '[5] = ',
+ 'first = 5',
+ 'second = 0',
+ '[7] = ',
+ 'first = 7',
+ 'second = 1'])
# check access-by-index
self.expect("frame variable ii[0]",
- substrs = ['first = 0',
- 'second = 0']);
+ substrs=['first = 0',
+ 'second = 0'])
self.expect("frame variable ii[3]",
- substrs = ['first =',
- 'second =']);
+ substrs=['first =',
+ 'second ='])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("ii").MightHaveChildren(), "ii.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("ii").MightHaveChildren(),
+ "ii.MightHaveChildren() says False for non empty!")
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression ii[8]", matching=False, error=True,
+ # self.expect("expression ii[8]", matching=False, error=True,
# substrs = ['1234567'])
- self.runCmd("continue");
-
+ self.runCmd("continue")
+
self.expect('frame variable ii',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
self.expect('frame variable si',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
- self.runCmd("continue");
+ self.runCmd("continue")
self.expect('frame variable si',
- substrs = ['size=1',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0'])
+ substrs=['size=1',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable si",
- substrs = ['size=4',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0',
- '[1] = ',
- 'first = \"one\"',
- 'second = 1',
- '[2] = ',
- 'first = \"two\"',
- 'second = 2',
- '[3] = ',
- 'first = \"three\"',
- 'second = 3'])
+ substrs=['size=4',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0',
+ '[1] = ',
+ 'first = \"one\"',
+ 'second = 1',
+ '[2] = ',
+ 'first = \"two\"',
+ 'second = 2',
+ '[3] = ',
+ 'first = \"three\"',
+ 'second = 3'])
self.expect("p si",
- substrs = ['size=4',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0',
- '[1] = ',
- 'first = \"one\"',
- 'second = 1',
- '[2] = ',
- 'first = \"two\"',
- 'second = 2',
- '[3] = ',
- 'first = \"three\"',
- 'second = 3'])
+ substrs=['size=4',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0',
+ '[1] = ',
+ 'first = \"one\"',
+ 'second = 1',
+ '[2] = ',
+ 'first = \"two\"',
+ 'second = 2',
+ '[3] = ',
+ 'first = \"three\"',
+ 'second = 3'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("si").MightHaveChildren(), "si.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("si").MightHaveChildren(),
+ "si.MightHaveChildren() says False for non empty!")
# check access-by-index
self.expect("frame variable si[0]",
- substrs = ['first = ', 'one',
- 'second = 1']);
-
+ substrs=['first = ', 'one',
+ 'second = 1'])
+
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression si[0]", matching=False, error=True,
+ # self.expect("expression si[0]", matching=False, error=True,
# substrs = ['first = ', 'zero'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable si',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable is',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable is",
- substrs = ['size=4',
- '[0] = ',
- 'second = \"goofy\"',
- 'first = 85',
- '[1] = ',
- 'second = \"is\"',
- 'first = 1',
- '[2] = ',
- 'second = \"smart\"',
- 'first = 2',
- '[3] = ',
- 'second = \"!!!\"',
- 'first = 3'])
-
+ substrs=['size=4',
+ '[0] = ',
+ 'second = \"goofy\"',
+ 'first = 85',
+ '[1] = ',
+ 'second = \"is\"',
+ 'first = 1',
+ '[2] = ',
+ 'second = \"smart\"',
+ 'first = 2',
+ '[3] = ',
+ 'second = \"!!!\"',
+ 'first = 3'])
+
self.expect("p is",
- substrs = ['size=4',
- '[0] = ',
- 'second = \"goofy\"',
- 'first = 85',
- '[1] = ',
- 'second = \"is\"',
- 'first = 1',
- '[2] = ',
- 'second = \"smart\"',
- 'first = 2',
- '[3] = ',
- 'second = \"!!!\"',
- 'first = 3'])
+ substrs=['size=4',
+ '[0] = ',
+ 'second = \"goofy\"',
+ 'first = 85',
+ '[1] = ',
+ 'second = \"is\"',
+ 'first = 1',
+ '[2] = ',
+ 'second = \"smart\"',
+ 'first = 2',
+ '[3] = ',
+ 'second = \"!!!\"',
+ 'first = 3'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("is").MightHaveChildren(), "is.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("is").MightHaveChildren(),
+ "is.MightHaveChildren() says False for non empty!")
# check access-by-index
self.expect("frame variable is[0]",
- substrs = ['first = ',
- 'second =']);
-
+ substrs=['first = ',
+ 'second ='])
+
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression is[0]", matching=False, error=True,
+ # self.expect("expression is[0]", matching=False, error=True,
# substrs = ['first = ', 'goofy'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable is',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable ss',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable ss",
- substrs = ['size=3',
- '[0] = ',
- 'second = \"hello\"',
- 'first = \"ciao\"',
- '[1] = ',
- 'second = \"house\"',
- 'first = \"casa\"',
- '[2] = ',
- 'second = \"cat\"',
- 'first = \"gatto\"'])
-
+ substrs=['size=3',
+ '[0] = ',
+ 'second = \"hello\"',
+ 'first = \"ciao\"',
+ '[1] = ',
+ 'second = \"house\"',
+ 'first = \"casa\"',
+ '[2] = ',
+ 'second = \"cat\"',
+ 'first = \"gatto\"'])
+
self.expect("p ss",
- substrs = ['size=3',
- '[0] = ',
- 'second = \"hello\"',
- 'first = \"ciao\"',
- '[1] = ',
- 'second = \"house\"',
- 'first = \"casa\"',
- '[2] = ',
- 'second = \"cat\"',
- 'first = \"gatto\"'])
+ substrs=['size=3',
+ '[0] = ',
+ 'second = \"hello\"',
+ 'first = \"ciao\"',
+ '[1] = ',
+ 'second = \"house\"',
+ 'first = \"casa\"',
+ '[2] = ',
+ 'second = \"cat\"',
+ 'first = \"gatto\"'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("ss").MightHaveChildren(), "ss.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("ss").MightHaveChildren(),
+ "ss.MightHaveChildren() says False for non empty!")
# check access-by-index
self.expect("frame variable ss[2]",
- substrs = ['gatto', 'cat']);
-
+ substrs=['gatto', 'cat'])
+
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression ss[3]", matching=False, error=True,
+ # self.expect("expression ss[3]", matching=False, error=True,
# substrs = ['gatto'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable ss',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py Tue Sep 6 15:57:50 2016
@@ -5,35 +5,39 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxMultiMapDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
@skipIf(compiler="gcc")
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\+\+"))
+ 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'])
+ 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.
@@ -42,259 +46,269 @@ class LibcxxMultiMapDataFormatterTestCas
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)
+ 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('image list', substrs=self.getLibcPlusPlusLibs())
+
self.expect('frame variable ii',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect('frame variable ii',
- substrs = ['size=2',
- '[0] = ',
- 'first = 0',
- 'second = 0',
- '[1] = ',
- 'first = 1',
- 'second = 1'])
+ substrs=['size=2',
+ '[0] = ',
+ 'first = 0',
+ 'second = 0',
+ '[1] = ',
+ 'first = 1',
+ 'second = 1'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect('frame variable ii',
- substrs = ['size=4',
- '[2] = ',
- 'first = 2',
- 'second = 0',
- '[3] = ',
- 'first = 3',
- 'second = 1'])
+ substrs=['size=4',
+ '[2] = ',
+ 'first = 2',
+ 'second = 0',
+ '[3] = ',
+ 'first = 3',
+ 'second = 1'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable ii",
- substrs = ['size=8',
- '[5] = ',
- 'first = 5',
- 'second = 0',
- '[7] = ',
- 'first = 7',
- 'second = 1'])
+ substrs=['size=8',
+ '[5] = ',
+ 'first = 5',
+ 'second = 0',
+ '[7] = ',
+ 'first = 7',
+ 'second = 1'])
self.expect("p ii",
- substrs = ['size=8',
- '[5] = ',
- 'first = 5',
- 'second = 0',
- '[7] = ',
- 'first = 7',
- 'second = 1'])
+ substrs=['size=8',
+ '[5] = ',
+ 'first = 5',
+ 'second = 0',
+ '[7] = ',
+ 'first = 7',
+ 'second = 1'])
# check access-by-index
self.expect("frame variable ii[0]",
- substrs = ['first = 0',
- 'second = 0']);
+ substrs=['first = 0',
+ 'second = 0'])
self.expect("frame variable ii[3]",
- substrs = ['first =',
- 'second =']);
+ substrs=['first =',
+ 'second ='])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("ii").MightHaveChildren(), "ii.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("ii").MightHaveChildren(),
+ "ii.MightHaveChildren() says False for non empty!")
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression ii[8]", matching=False, error=True,
+ # self.expect("expression ii[8]", matching=False, error=True,
# substrs = ['1234567'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable ii',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
self.expect('frame variable si',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect('frame variable si',
- substrs = ['size=1',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0'])
+ substrs=['size=1',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable si",
- substrs = ['size=4',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0',
- '[1] = ',
- 'first = \"one\"',
- 'second = 1',
- '[2] = ',
- 'first = \"two\"',
- 'second = 2',
- '[3] = ',
- 'first = \"three\"',
- 'second = 3'])
+ substrs=['size=4',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0',
+ '[1] = ',
+ 'first = \"one\"',
+ 'second = 1',
+ '[2] = ',
+ 'first = \"two\"',
+ 'second = 2',
+ '[3] = ',
+ 'first = \"three\"',
+ 'second = 3'])
self.expect("p si",
- substrs = ['size=4',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0',
- '[1] = ',
- 'first = \"one\"',
- 'second = 1',
- '[2] = ',
- 'first = \"two\"',
- 'second = 2',
- '[3] = ',
- 'first = \"three\"',
- 'second = 3'])
+ substrs=['size=4',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0',
+ '[1] = ',
+ 'first = \"one\"',
+ 'second = 1',
+ '[2] = ',
+ 'first = \"two\"',
+ 'second = 2',
+ '[3] = ',
+ 'first = \"three\"',
+ 'second = 3'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("si").MightHaveChildren(), "si.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("si").MightHaveChildren(),
+ "si.MightHaveChildren() says False for non empty!")
# check access-by-index
self.expect("frame variable si[0]",
- substrs = ['first = ', 'one',
- 'second = 1']);
-
+ substrs=['first = ', 'one',
+ 'second = 1'])
+
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression si[0]", matching=False, error=True,
+ # self.expect("expression si[0]", matching=False, error=True,
# substrs = ['first = ', 'zero'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable si',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable is',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable is",
- substrs = ['size=4',
- '[0] = ',
- 'second = \"goofy\"',
- 'first = 85',
- '[1] = ',
- 'second = \"is\"',
- 'first = 1',
- '[2] = ',
- 'second = \"smart\"',
- 'first = 2',
- '[3] = ',
- 'second = \"!!!\"',
- 'first = 3'])
-
+ substrs=['size=4',
+ '[0] = ',
+ 'second = \"goofy\"',
+ 'first = 85',
+ '[1] = ',
+ 'second = \"is\"',
+ 'first = 1',
+ '[2] = ',
+ 'second = \"smart\"',
+ 'first = 2',
+ '[3] = ',
+ 'second = \"!!!\"',
+ 'first = 3'])
+
self.expect("p is",
- substrs = ['size=4',
- '[0] = ',
- 'second = \"goofy\"',
- 'first = 85',
- '[1] = ',
- 'second = \"is\"',
- 'first = 1',
- '[2] = ',
- 'second = \"smart\"',
- 'first = 2',
- '[3] = ',
- 'second = \"!!!\"',
- 'first = 3'])
+ substrs=['size=4',
+ '[0] = ',
+ 'second = \"goofy\"',
+ 'first = 85',
+ '[1] = ',
+ 'second = \"is\"',
+ 'first = 1',
+ '[2] = ',
+ 'second = \"smart\"',
+ 'first = 2',
+ '[3] = ',
+ 'second = \"!!!\"',
+ 'first = 3'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("is").MightHaveChildren(), "is.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("is").MightHaveChildren(),
+ "is.MightHaveChildren() says False for non empty!")
# check access-by-index
self.expect("frame variable is[0]",
- substrs = ['first = ',
- 'second =']);
-
+ substrs=['first = ',
+ 'second ='])
+
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression is[0]", matching=False, error=True,
+ # self.expect("expression is[0]", matching=False, error=True,
# substrs = ['first = ', 'goofy'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable is',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable ss',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable ss",
- substrs = ['size=3',
- '[0] = ',
- 'second = \"hello\"',
- 'first = \"ciao\"',
- '[1] = ',
- 'second = \"house\"',
- 'first = \"casa\"',
- '[2] = ',
- 'second = \"cat\"',
- 'first = \"gatto\"'])
-
+ substrs=['size=3',
+ '[0] = ',
+ 'second = \"hello\"',
+ 'first = \"ciao\"',
+ '[1] = ',
+ 'second = \"house\"',
+ 'first = \"casa\"',
+ '[2] = ',
+ 'second = \"cat\"',
+ 'first = \"gatto\"'])
+
self.expect("p ss",
- substrs = ['size=3',
- '[0] = ',
- 'second = \"hello\"',
- 'first = \"ciao\"',
- '[1] = ',
- 'second = \"house\"',
- 'first = \"casa\"',
- '[2] = ',
- 'second = \"cat\"',
- 'first = \"gatto\"'])
+ substrs=['size=3',
+ '[0] = ',
+ 'second = \"hello\"',
+ 'first = \"ciao\"',
+ '[1] = ',
+ 'second = \"house\"',
+ 'first = \"casa\"',
+ '[2] = ',
+ 'second = \"cat\"',
+ 'first = \"gatto\"'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("ss").MightHaveChildren(), "ss.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("ss").MightHaveChildren(),
+ "ss.MightHaveChildren() says False for non empty!")
# check access-by-index
self.expect("frame variable ss[2]",
- substrs = ['gatto', 'cat']);
-
+ substrs=['gatto', 'cat'])
+
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression ss[3]", matching=False, error=True,
+ # self.expect("expression ss[3]", matching=False, error=True,
# substrs = ['gatto'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect('frame variable ss',
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py Tue Sep 6 15:57:50 2016
@@ -5,34 +5,38 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxMultiSetDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
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\+\+"))
+ 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'])
+ 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.
@@ -41,30 +45,78 @@ class LibcxxMultiSetDataFormatterTestCas
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)
+ 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('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("p ii",substrs = ["size=7","[2] = 2", "[3] = 3", "[6] = 6"])
- self.expect("frame variable ii[2]",substrs = [" = 2"])
- 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"'])
+ self.expect("frame variable ii", substrs=["size=0", "{}"])
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"'])
+ 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(
+ "p ii",
+ substrs=[
+ "size=7",
+ "[2] = 2",
+ "[3] = 3",
+ "[6] = 6"])
+ self.expect("frame variable ii[2]", substrs=[" = 2"])
+ 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"'])
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=280751&r1=280750&r2=280751&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 Tue Sep 6 15:57:50 2016
@@ -5,24 +5,25 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxSetDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
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."))
self.runCmd("run", RUN_SUCCEEDED)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py Tue Sep 6 15:57:50 2016
@@ -1,4 +1,4 @@
-#coding=utf8
+# coding=utf8
"""
Test lldb data formatter subsystem.
"""
@@ -6,13 +6,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxStringDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -24,22 +25,24 @@ class LibcxxStringDataFormatterTestCase(
self.line = line_number('main.cpp', '// Set break point at this line.')
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
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)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
- lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
+ 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'])
+ 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.
@@ -48,40 +51,51 @@ class LibcxxStringDataFormatterTestCase(
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)
+ 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("frame variable",
- substrs = ['(std::__1::wstring) s = L"hello world! ××× ×××!"',
- '(std::__1::wstring) S = L"!!!!"',
- '(const wchar_t *) mazeltov = 0x','L"××× ×××"',
- '(std::__1::string) q = "hello world"',
- '(std::__1::string) Q = "quite a long std::strin with lots of info inside it"',
- '(std::__1::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"',
- '(std::__1::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'])
+ self.expect(
+ "frame variable",
+ substrs=[
+ '(std::__1::wstring) s = L"hello world! ××× ×××!"',
+ '(std::__1::wstring) S = L"!!!!"',
+ '(const wchar_t *) mazeltov = 0x',
+ 'L"××× ×××"',
+ '(std::__1::string) q = "hello world"',
+ '(std::__1::string) Q = "quite a long std::strin with lots of info inside it"',
+ '(std::__1::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"',
+ '(std::__1::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'])
self.runCmd("n")
- TheVeryLongOne = self.frame().FindVariable("TheVeryLongOne");
+ TheVeryLongOne = self.frame().FindVariable("TheVeryLongOne")
summaryOptions = lldb.SBTypeSummaryOptions()
summaryOptions.SetCapping(lldb.eTypeSummaryUncapped)
uncappedSummaryStream = lldb.SBStream()
- TheVeryLongOne.GetSummary(uncappedSummaryStream,summaryOptions)
+ TheVeryLongOne.GetSummary(uncappedSummaryStream, summaryOptions)
uncappedSummary = uncappedSummaryStream.GetData()
- self.assertTrue(uncappedSummary.find("someText") > 0, "uncappedSummary does not include the full string")
+ self.assertTrue(uncappedSummary.find("someText") > 0,
+ "uncappedSummary does not include the full string")
summaryOptions.SetCapping(lldb.eTypeSummaryCapped)
cappedSummaryStream = lldb.SBStream()
- TheVeryLongOne.GetSummary(cappedSummaryStream,summaryOptions)
+ TheVeryLongOne.GetSummary(cappedSummaryStream, summaryOptions)
cappedSummary = cappedSummaryStream.GetData()
- self.assertTrue(cappedSummary.find("someText") <= 0, "cappedSummary includes the full string")
-
- self.expect("frame variable",
- substrs = ['(std::__1::wstring) s = L"hello world! ××× ×××!"',
- '(std::__1::wstring) S = L"!!!!!"',
- '(const wchar_t *) mazeltov = 0x','L"××× ×××"',
- '(std::__1::string) q = "hello world"',
- '(std::__1::string) Q = "quite a long std::strin with lots of info inside it"',
- '(std::__1::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"',
- '(std::__1::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'])
+ self.assertTrue(
+ cappedSummary.find("someText") <= 0,
+ "cappedSummary includes the full string")
+
+ self.expect(
+ "frame variable",
+ substrs=[
+ '(std::__1::wstring) s = L"hello world! ××× ×××!"',
+ '(std::__1::wstring) S = L"!!!!!"',
+ '(const wchar_t *) mazeltov = 0x',
+ 'L"××× ×××"',
+ '(std::__1::string) q = "hello world"',
+ '(std::__1::string) Q = "quite a long std::strin with lots of info inside it"',
+ '(std::__1::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"',
+ '(std::__1::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py Tue Sep 6 15:57:50 2016
@@ -5,34 +5,37 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxUnorderedDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
@skipIf(compiler="gcc")
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)
- lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")
+ 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\+\+"))
+ 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'])
+ 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.
@@ -41,12 +44,14 @@ class LibcxxUnorderedDataFormatterTestCa
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)
+ 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('image list', substrs=self.getLibcPlusPlusLibs())
self.look_for_content_and_continue(
"map", ['size=5 {', 'hello', 'world', 'this', 'is', 'me'])
@@ -72,6 +77,6 @@ class LibcxxUnorderedDataFormatterTestCa
'(\[\d\] = "world"(\\n|.)+){2}'])
def look_for_content_and_continue(self, var_name, patterns):
- self.expect( ("frame variable %s" % var_name), patterns=patterns)
- self.expect( ("frame variable %s" % var_name), patterns=patterns)
+ self.expect(("frame variable %s" % var_name), patterns=patterns)
+ self.expect(("frame variable %s" % var_name), patterns=patterns)
self.runCmd("continue")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxVBoolDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,22 +24,24 @@ class LibcxxVBoolDataFormatterTestCase(T
self.line = line_number('main.cpp', '// Set break point at this line.')
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows.
+ @skipIfWindows # libc++ not ported to Windows.
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)
- lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
+ lldbutil.skip_if_library_missing(
+ self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -47,13 +50,33 @@ class LibcxxVBoolDataFormatterTestCase(T
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)
+ 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("frame variable vBool",
- substrs = ['size=49','[0] = false','[1] = true','[18] = false','[27] = true','[36] = false','[47] = true','[48] = true'])
-
- self.expect("expr vBool",
- substrs = ['size=49','[0] = false','[1] = true','[18] = false','[27] = true','[36] = false','[47] = true','[48] = true'])
+ self.expect(
+ "frame variable vBool",
+ substrs=[
+ 'size=49',
+ '[0] = false',
+ '[1] = true',
+ '[18] = false',
+ '[27] = true',
+ '[36] = false',
+ '[47] = true',
+ '[48] = true'])
+
+ self.expect(
+ "expr vBool",
+ substrs=[
+ 'size=49',
+ '[0] = false',
+ '[1] = true',
+ '[18] = false',
+ '[27] = true',
+ '[36] = false',
+ '[47] = true',
+ '[48] = true'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py Tue Sep 6 15:57:50 2016
@@ -5,34 +5,38 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LibcxxVectorDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipIf(compiler="gcc")
- @skipIfWindows # libc++ not ported to Windows yet
+ @skipIfWindows # libc++ not ported to Windows yet
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)
-
- lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
- bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "break here"))
+ lldbutil.skip_if_library_missing(
+ self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
+
+ bkpt = self.target().FindBreakpointByID(
+ lldbutil.run_break_set_by_source_regexp(
+ self, "break here"))
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -41,51 +45,54 @@ class LibcxxVectorDataFormatterTestCase(
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)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
# empty vectors (and storage pointers SHOULD BOTH BE NULL..)
self.expect("frame variable numbers",
- substrs = ['numbers = size=0'])
+ substrs=['numbers = size=0'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
# first value added
self.expect("frame variable numbers",
- substrs = ['numbers = size=1',
- '[0] = 1',
- '}'])
+ substrs=['numbers = size=1',
+ '[0] = 1',
+ '}'])
# add some more data
lldbutil.continue_to_breakpoint(self.process(), bkpt)
-
+
self.expect("frame variable numbers",
- substrs = ['numbers = size=4',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '}'])
+ substrs=['numbers = size=4',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '}'])
self.expect("p numbers",
- substrs = ['$', 'size=4',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '}'])
+ substrs=['$', 'size=4',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '}'])
-
# check access to synthetic children
- self.runCmd("type summary add --summary-string \"item 0 is ${var[0]}\" std::int_vect int_vect")
+ self.runCmd(
+ "type summary add --summary-string \"item 0 is ${var[0]}\" std::int_vect int_vect")
self.expect('frame variable numbers',
- substrs = ['item 0 is 1']);
-
- self.runCmd("type summary add --summary-string \"item 0 is ${svar[0]}\" std::int_vect int_vect")
+ substrs=['item 0 is 1'])
+
+ self.runCmd(
+ "type summary add --summary-string \"item 0 is ${svar[0]}\" std::int_vect int_vect")
self.expect('frame variable numbers',
- substrs = ['item 0 is 1']);
+ substrs=['item 0 is 1'])
# move on with synths
self.runCmd("type summary delete std::int_vect")
self.runCmd("type summary delete int_vect")
@@ -94,88 +101,89 @@ class LibcxxVectorDataFormatterTestCase(
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable numbers",
- substrs = ['numbers = size=7',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '[4] = 12345',
- '[5] = 123456',
- '[6] = 1234567',
- '}'])
-
+ substrs=['numbers = size=7',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '[4] = 12345',
+ '[5] = 123456',
+ '[6] = 1234567',
+ '}'])
+
self.expect("p numbers",
- substrs = ['$', 'size=7',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '[4] = 12345',
- '[5] = 123456',
- '[6] = 1234567',
- '}'])
+ substrs=['$', 'size=7',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '[4] = 12345',
+ '[5] = 123456',
+ '[6] = 1234567',
+ '}'])
# check access-by-index
self.expect("frame variable numbers[0]",
- substrs = ['1']);
+ substrs=['1'])
self.expect("frame variable numbers[1]",
- substrs = ['12']);
+ substrs=['12'])
self.expect("frame variable numbers[2]",
- substrs = ['123']);
+ substrs=['123'])
self.expect("frame variable numbers[3]",
- substrs = ['1234']);
+ substrs=['1234'])
# clear out the vector and see that we do the right thing once again
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable numbers",
- substrs = ['numbers = size=0'])
+ substrs=['numbers = size=0'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
# first value added
self.expect("frame variable numbers",
- substrs = ['numbers = size=1',
- '[0] = 7',
- '}'])
+ substrs=['numbers = size=1',
+ '[0] = 7',
+ '}'])
# check if we can display strings
self.expect("frame variable strings",
- substrs = ['goofy',
- 'is',
- 'smart'])
+ substrs=['goofy',
+ 'is',
+ 'smart'])
self.expect("p strings",
- substrs = ['goofy',
- 'is',
- 'smart'])
+ substrs=['goofy',
+ 'is',
+ 'smart'])
# test summaries based on synthetic children
- self.runCmd("type summary add std::string_vect string_vect --summary-string \"vector has ${svar%#} items\" -e")
+ self.runCmd(
+ "type summary add std::string_vect string_vect --summary-string \"vector has ${svar%#} items\" -e")
self.expect("frame variable strings",
- substrs = ['vector has 3 items',
- 'goofy',
- 'is',
- 'smart'])
+ substrs=['vector has 3 items',
+ 'goofy',
+ 'is',
+ 'smart'])
self.expect("p strings",
- substrs = ['vector has 3 items',
- 'goofy',
- 'is',
- 'smart'])
+ substrs=['vector has 3 items',
+ 'goofy',
+ 'is',
+ 'smart'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable strings",
- substrs = ['vector has 4 items'])
-
+ substrs=['vector has 4 items'])
+
# check access-by-index
self.expect("frame variable strings[0]",
- substrs = ['goofy']);
+ substrs=['goofy'])
self.expect("frame variable strings[1]",
- substrs = ['is']);
+ substrs=['is'])
lldbutil.continue_to_breakpoint(self.process(), bkpt)
self.expect("frame variable strings",
- substrs = ['vector has 0 items'])
+ substrs=['vector has 0 items'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class StdIteratorDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -22,21 +23,24 @@ class StdIteratorDataFormatterTestCase(T
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- @skipIfWindows # libstdcpp not ported to Windows
- @expectedFailureAll(compiler="icc", bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
+ @skipIfWindows # libstdcpp not ported to Windows
+ @expectedFailureAll(
+ compiler="icc",
+ bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
def test_with_run_command(self):
"""Test that libstdcpp iterators format properly."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -45,19 +49,29 @@ class StdIteratorDataFormatterTestCase(T
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)
+ 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('frame variable ivI', substrs = ['item = 3'])
- self.expect('expr ivI', substrs = ['item = 3'])
-
- self.expect('frame variable iimI', substrs = ['first = 0','second = 12'])
- self.expect('expr iimI', substrs = ['first = 0','second = 12'])
+ self.expect('frame variable ivI', substrs=['item = 3'])
+ self.expect('expr ivI', substrs=['item = 3'])
- self.expect('frame variable simI', substrs = ['first = "world"','second = 42'])
- self.expect('expr simI', substrs = ['first = "world"','second = 42'])
+ self.expect(
+ 'frame variable iimI',
+ substrs=[
+ 'first = 0',
+ 'second = 12'])
+ self.expect('expr iimI', substrs=['first = 0', 'second = 12'])
+
+ self.expect(
+ 'frame variable simI',
+ substrs=[
+ 'first = "world"',
+ 'second = 42'])
+ self.expect('expr simI', substrs=['first = "world"', 'second = 42'])
- self.expect('frame variable svI', substrs = ['item = "hello"'])
- self.expect('expr svI', substrs = ['item = "hello"'])
+ self.expect('frame variable svI', substrs=['item = "hello"'])
+ self.expect('expr svI', substrs=['item = "hello"'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class StdListDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,23 +22,26 @@ class StdListDataFormatterTestCase(TestB
TestBase.setUp(self)
# Find the line numbers to break at for the different tests.
self.line = line_number('main.cpp', '// Set break point at this line.')
- self.optional_line = line_number('main.cpp', '// Optional break point at this line.')
- self.final_line = line_number('main.cpp', '// Set final break point at this line.')
+ self.optional_line = line_number(
+ 'main.cpp', '// Optional break point at this line.')
+ self.final_line = line_number(
+ 'main.cpp', '// Set final break point at this line.')
- @skipIfWindows # libstdcpp not ported to Windows
+ @skipIfWindows # libstdcpp not ported to Windows
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)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -46,7 +50,9 @@ class StdListDataFormatterTestCase(TestB
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)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
@@ -56,134 +62,148 @@ class StdListDataFormatterTestCase(TestB
self.runCmd("type format add -f hex int")
self.expect("frame variable numbers_list --raw", matching=False,
- substrs = ['size=0',
- '{}'])
- self.expect("frame variable &numbers_list._M_impl._M_node --raw", matching=False,
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
+ self.expect(
+ "frame variable &numbers_list._M_impl._M_node --raw",
+ matching=False,
+ substrs=[
+ 'size=0',
+ '{}'])
self.expect("frame variable numbers_list",
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
self.expect("p numbers_list",
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
self.runCmd("n")
self.expect("frame variable numbers_list",
- substrs = ['size=1',
- '[0] = ',
- '0x12345678'])
+ substrs=['size=1',
+ '[0] = ',
+ '0x12345678'])
- self.runCmd("n");self.runCmd("n");self.runCmd("n");
+ self.runCmd("n")
+ self.runCmd("n")
+ self.runCmd("n")
self.expect("frame variable numbers_list",
- substrs = ['size=4',
- '[0] = ',
- '0x12345678',
- '[1] =',
- '0x11223344',
- '[2] =',
- '0xbeeffeed',
- '[3] =',
- '0x00abba00'])
+ substrs=['size=4',
+ '[0] = ',
+ '0x12345678',
+ '[1] =',
+ '0x11223344',
+ '[2] =',
+ '0xbeeffeed',
+ '[3] =',
+ '0x00abba00'])
- self.runCmd("n");self.runCmd("n");
+ self.runCmd("n")
+ self.runCmd("n")
self.expect("frame variable numbers_list",
- substrs = ['size=6',
- '[0] = ',
- '0x12345678',
- '0x11223344',
- '0xbeeffeed',
- '0x00abba00',
- '[4] =',
- '0x0abcdef0',
- '[5] =',
- '0x0cab0cab'])
+ substrs=['size=6',
+ '[0] = ',
+ '0x12345678',
+ '0x11223344',
+ '0xbeeffeed',
+ '0x00abba00',
+ '[4] =',
+ '0x0abcdef0',
+ '[5] =',
+ '0x0cab0cab'])
self.expect("p numbers_list",
- substrs = ['size=6',
- '[0] = ',
- '0x12345678',
- '0x11223344',
- '0xbeeffeed',
- '0x00abba00',
- '[4] =',
- '0x0abcdef0',
- '[5] =',
- '0x0cab0cab'])
+ substrs=['size=6',
+ '[0] = ',
+ '0x12345678',
+ '0x11223344',
+ '0xbeeffeed',
+ '0x00abba00',
+ '[4] =',
+ '0x0abcdef0',
+ '[5] =',
+ '0x0cab0cab'])
# check access-by-index
self.expect("frame variable numbers_list[0]",
- substrs = ['0x12345678']);
+ substrs=['0x12345678'])
self.expect("frame variable numbers_list[1]",
- substrs = ['0x11223344']);
-
+ substrs=['0x11223344'])
+
# but check that expression does not rely on us
self.expect("expression numbers_list[0]", matching=False, error=True,
- substrs = ['0x12345678'])
+ substrs=['0x12345678'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("numbers_list").MightHaveChildren(), "numbers_list.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("numbers_list").MightHaveChildren(),
+ "numbers_list.MightHaveChildren() says False for non empty!")
self.runCmd("n")
-
+
self.expect("frame variable numbers_list",
- substrs = ['size=0',
- '{}'])
+ substrs=['size=0',
+ '{}'])
+
+ self.runCmd("n")
+ self.runCmd("n")
+ self.runCmd("n")
+ self.runCmd("n")
- self.runCmd("n");self.runCmd("n");self.runCmd("n");self.runCmd("n");
-
self.expect("frame variable numbers_list",
- substrs = ['size=4',
- '[0] = ', '1',
- '[1] = ', '2',
- '[2] = ', '3',
- '[3] = ', '4'])
+ substrs=['size=4',
+ '[0] = ', '1',
+ '[1] = ', '2',
+ '[2] = ', '3',
+ '[3] = ', '4'])
self.runCmd("type format delete int")
self.runCmd("n")
-
+
self.expect("frame variable text_list",
- substrs = ['size=0',
- '{}'])
-
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.final_line, num_expected_locations=-1)
+ substrs=['size=0',
+ '{}'])
+
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.final_line, num_expected_locations=-1)
self.runCmd("c", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
self.expect("frame variable text_list",
- substrs = ['size=4',
- '[0]', 'goofy',
- '[1]', 'is',
- '[2]', 'smart',
- '[3]', '!!!'])
+ substrs=['size=4',
+ '[0]', 'goofy',
+ '[1]', 'is',
+ '[2]', 'smart',
+ '[3]', '!!!'])
self.expect("p text_list",
- substrs = ['size=4',
- '\"goofy\"',
- '\"is\"',
- '\"smart\"',
- '\"!!!\"'])
-
+ substrs=['size=4',
+ '\"goofy\"',
+ '\"is\"',
+ '\"smart\"',
+ '\"!!!\"'])
+
# check access-by-index
self.expect("frame variable text_list[0]",
- substrs = ['goofy']);
+ substrs=['goofy'])
self.expect("frame variable text_list[3]",
- substrs = ['!!!']);
-
+ substrs=['!!!'])
+
# but check that expression does not rely on us
self.expect("expression text_list[0]", matching=False, error=True,
- substrs = ['goofy'])
+ substrs=['goofy'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("text_list").MightHaveChildren(), "text_list.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("text_list").MightHaveChildren(),
+ "text_list.MightHaveChildren() says False for non empty!")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class StdMapDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -22,22 +23,25 @@ class StdMapDataFormatterTestCase(TestBa
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- @expectedFailureAll(compiler="icc", bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
- @skipIfWindows # libstdcpp not ported to Windows
+ @expectedFailureAll(
+ compiler="icc",
+ bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
+ @skipIfWindows # libstdcpp not ported to Windows
@skipIfFreeBSD
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)
- lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")
+ lldbutil.run_break_set_by_source_regexp(
+ self, "Set break point at this line.")
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -46,278 +50,289 @@ class StdMapDataFormatterTestCase(TestBa
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)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
self.runCmd("frame variable ii --show-types")
-
- self.runCmd("type summary add -x \"std::map<\" --summary-string \"map has ${svar%#} items\" -e")
-
+
+ self.runCmd(
+ "type summary add -x \"std::map<\" --summary-string \"map has ${svar%#} items\" -e")
+
self.expect('frame variable ii',
- substrs = ['map has 0 items',
- '{}'])
+ substrs=['map has 0 items',
+ '{}'])
- self.runCmd("c");
+ self.runCmd("c")
self.expect('frame variable ii',
- substrs = ['map has 2 items',
- '[0] = ',
- 'first = 0',
- 'second = 0',
- '[1] = ',
- 'first = 1',
- 'second = 1'])
+ substrs=['map has 2 items',
+ '[0] = ',
+ 'first = 0',
+ 'second = 0',
+ '[1] = ',
+ 'first = 1',
+ 'second = 1'])
- self.runCmd("c");
+ self.runCmd("c")
self.expect('frame variable ii',
- substrs = ['map has 4 items',
- '[2] = ',
- 'first = 2',
- 'second = 0',
- '[3] = ',
- 'first = 3',
- 'second = 1'])
+ substrs=['map has 4 items',
+ '[2] = ',
+ 'first = 2',
+ 'second = 0',
+ '[3] = ',
+ 'first = 3',
+ 'second = 1'])
- self.runCmd("c");
+ self.runCmd("c")
self.expect("frame variable ii",
- substrs = ['map has 9 items',
- '[5] = ',
- 'first = 5',
- 'second = 0',
- '[7] = ',
- 'first = 7',
- 'second = 1'])
-
+ substrs=['map has 9 items',
+ '[5] = ',
+ 'first = 5',
+ 'second = 0',
+ '[7] = ',
+ 'first = 7',
+ 'second = 1'])
+
self.expect("p ii",
- substrs = ['map has 9 items',
- '[5] = ',
- 'first = 5',
- 'second = 0',
- '[7] = ',
- 'first = 7',
- 'second = 1'])
+ substrs=['map has 9 items',
+ '[5] = ',
+ 'first = 5',
+ 'second = 0',
+ '[7] = ',
+ 'first = 7',
+ 'second = 1'])
# check access-by-index
self.expect("frame variable ii[0]",
- substrs = ['first = 0',
- 'second = 0']);
+ substrs=['first = 0',
+ 'second = 0'])
self.expect("frame variable ii[3]",
- substrs = ['first =',
- 'second =']);
-
+ substrs=['first =',
+ 'second ='])
+
self.expect("frame variable ii[8]", matching=True,
- substrs = ['1234567'])
+ substrs=['1234567'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("ii").MightHaveChildren(), "ii.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("ii").MightHaveChildren(),
+ "ii.MightHaveChildren() says False for non empty!")
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression ii[8]", matching=False, error=True,
+ # self.expect("expression ii[8]", matching=False, error=True,
# substrs = ['1234567'])
self.runCmd("c")
-
+
self.expect('frame variable ii',
- substrs = ['map has 0 items',
- '{}'])
-
+ substrs=['map has 0 items',
+ '{}'])
+
self.runCmd("frame variable si --show-types")
self.expect('frame variable si',
- substrs = ['map has 0 items',
- '{}'])
+ substrs=['map has 0 items',
+ '{}'])
self.runCmd("c")
self.expect('frame variable si',
- substrs = ['map has 1 items',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0'])
+ substrs=['map has 1 items',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0'])
- self.runCmd("c");
+ self.runCmd("c")
self.expect("frame variable si",
- substrs = ['map has 5 items',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0',
- '[1] = ',
- 'first = \"one\"',
- 'second = 1',
- '[2] = ',
- 'first = \"two\"',
- 'second = 2',
- '[3] = ',
- 'first = \"three\"',
- 'second = 3',
- '[4] = ',
- 'first = \"four\"',
- 'second = 4'])
+ substrs=['map has 5 items',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0',
+ '[1] = ',
+ 'first = \"one\"',
+ 'second = 1',
+ '[2] = ',
+ 'first = \"two\"',
+ 'second = 2',
+ '[3] = ',
+ 'first = \"three\"',
+ 'second = 3',
+ '[4] = ',
+ 'first = \"four\"',
+ 'second = 4'])
self.expect("p si",
- substrs = ['map has 5 items',
- '[0] = ',
- 'first = \"zero\"',
- 'second = 0',
- '[1] = ',
- 'first = \"one\"',
- 'second = 1',
- '[2] = ',
- 'first = \"two\"',
- 'second = 2',
- '[3] = ',
- 'first = \"three\"',
- 'second = 3',
- '[4] = ',
- 'first = \"four\"',
- 'second = 4'])
+ substrs=['map has 5 items',
+ '[0] = ',
+ 'first = \"zero\"',
+ 'second = 0',
+ '[1] = ',
+ 'first = \"one\"',
+ 'second = 1',
+ '[2] = ',
+ 'first = \"two\"',
+ 'second = 2',
+ '[3] = ',
+ 'first = \"three\"',
+ 'second = 3',
+ '[4] = ',
+ 'first = \"four\"',
+ 'second = 4'])
# check access-by-index
self.expect("frame variable si[0]",
- substrs = ['first = ', 'four',
- 'second = 4']);
+ substrs=['first = ', 'four',
+ 'second = 4'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("si").MightHaveChildren(), "si.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("si").MightHaveChildren(),
+ "si.MightHaveChildren() says False for non empty!")
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression si[0]", matching=False, error=True,
+ # self.expect("expression si[0]", matching=False, error=True,
# substrs = ['first = ', 'zero'])
self.runCmd("c")
-
+
self.expect('frame variable si',
- substrs = ['map has 0 items',
- '{}'])
+ substrs=['map has 0 items',
+ '{}'])
self.runCmd("frame variable is --show-types")
-
+
self.expect('frame variable is',
- substrs = ['map has 0 items',
- '{}'])
+ substrs=['map has 0 items',
+ '{}'])
- self.runCmd("c");
+ self.runCmd("c")
self.expect("frame variable is",
- substrs = ['map has 4 items',
- '[0] = ',
- 'second = \"goofy\"',
- 'first = 85',
- '[1] = ',
- 'second = \"is\"',
- 'first = 1',
- '[2] = ',
- 'second = \"smart\"',
- 'first = 2',
- '[3] = ',
- 'second = \"!!!\"',
- 'first = 3'])
-
+ substrs=['map has 4 items',
+ '[0] = ',
+ 'second = \"goofy\"',
+ 'first = 85',
+ '[1] = ',
+ 'second = \"is\"',
+ 'first = 1',
+ '[2] = ',
+ 'second = \"smart\"',
+ 'first = 2',
+ '[3] = ',
+ 'second = \"!!!\"',
+ 'first = 3'])
+
self.expect("p is",
- substrs = ['map has 4 items',
- '[0] = ',
- 'second = \"goofy\"',
- 'first = 85',
- '[1] = ',
- 'second = \"is\"',
- 'first = 1',
- '[2] = ',
- 'second = \"smart\"',
- 'first = 2',
- '[3] = ',
- 'second = \"!!!\"',
- 'first = 3'])
+ substrs=['map has 4 items',
+ '[0] = ',
+ 'second = \"goofy\"',
+ 'first = 85',
+ '[1] = ',
+ 'second = \"is\"',
+ 'first = 1',
+ '[2] = ',
+ 'second = \"smart\"',
+ 'first = 2',
+ '[3] = ',
+ 'second = \"!!!\"',
+ 'first = 3'])
# check access-by-index
self.expect("frame variable is[0]",
- substrs = ['first = ',
- 'second =']);
+ substrs=['first = ',
+ 'second ='])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("is").MightHaveChildren(), "is.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("is").MightHaveChildren(),
+ "is.MightHaveChildren() says False for non empty!")
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression is[0]", matching=False, error=True,
+ # self.expect("expression is[0]", matching=False, error=True,
# substrs = ['first = ', 'goofy'])
self.runCmd("c")
-
+
self.expect('frame variable is',
- substrs = ['map has 0 items',
- '{}'])
+ substrs=['map has 0 items',
+ '{}'])
self.runCmd("frame variable ss --show-types")
-
+
self.expect('frame variable ss',
- substrs = ['map has 0 items',
- '{}'])
+ substrs=['map has 0 items',
+ '{}'])
- self.runCmd("c");
+ self.runCmd("c")
self.expect("frame variable ss",
- substrs = ['map has 4 items',
- '[0] = ',
- 'second = \"hello\"',
- 'first = \"ciao\"',
- '[1] = ',
- 'second = \"house\"',
- 'first = \"casa\"',
- '[2] = ',
- 'second = \"cat\"',
- 'first = \"gatto\"',
- '[3] = ',
- 'second = \"..is always a Mac!\"',
- 'first = \"a Mac..\"'])
-
+ substrs=['map has 4 items',
+ '[0] = ',
+ 'second = \"hello\"',
+ 'first = \"ciao\"',
+ '[1] = ',
+ 'second = \"house\"',
+ 'first = \"casa\"',
+ '[2] = ',
+ 'second = \"cat\"',
+ 'first = \"gatto\"',
+ '[3] = ',
+ 'second = \"..is always a Mac!\"',
+ 'first = \"a Mac..\"'])
+
self.expect("p ss",
- substrs = ['map has 4 items',
- '[0] = ',
- 'second = \"hello\"',
- 'first = \"ciao\"',
- '[1] = ',
- 'second = \"house\"',
- 'first = \"casa\"',
- '[2] = ',
- 'second = \"cat\"',
- 'first = \"gatto\"',
- '[3] = ',
- 'second = \"..is always a Mac!\"',
- 'first = \"a Mac..\"'])
+ substrs=['map has 4 items',
+ '[0] = ',
+ 'second = \"hello\"',
+ 'first = \"ciao\"',
+ '[1] = ',
+ 'second = \"house\"',
+ 'first = \"casa\"',
+ '[2] = ',
+ 'second = \"cat\"',
+ 'first = \"gatto\"',
+ '[3] = ',
+ 'second = \"..is always a Mac!\"',
+ 'first = \"a Mac..\"'])
# check access-by-index
self.expect("frame variable ss[3]",
- substrs = ['gatto', 'cat']);
+ substrs=['gatto', 'cat'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("ss").MightHaveChildren(), "ss.MightHaveChildren() says False for non empty!")
-
+ self.assertTrue(
+ self.frame().FindVariable("ss").MightHaveChildren(),
+ "ss.MightHaveChildren() says False for non empty!")
+
# check that the expression parser does not make use of
# synthetic children instead of running code
# TOT clang has a fix for this, which makes the expression command here succeed
# since this would make the test fail or succeed depending on clang version in use
# this is safer commented for the time being
- #self.expect("expression ss[3]", matching=False, error=True,
+ # self.expect("expression ss[3]", matching=False, error=True,
# substrs = ['gatto'])
self.runCmd("c")
-
+
self.expect('frame variable ss',
- substrs = ['map has 0 items',
- '{}'])
+ substrs=['map has 0 items',
+ '{}'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py Tue Sep 6 15:57:50 2016
@@ -4,43 +4,46 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class StdSmartPtrDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipIfFreeBSD
- @skipIfWindows # libstdcpp not ported to Windows
- @skipIfDarwin # doesn't compile on Darwin
+ @skipIfWindows # libstdcpp not ported to Windows
+ @skipIfDarwin # doesn't compile on Darwin
def test_with_run_command(self):
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")
+ lldbutil.run_break_set_by_source_regexp(
+ self, "Set break point at this line.")
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
+
+ self.expect("frame variable nsp", substrs=['nsp = nullptr'])
+ self.expect("frame variable isp", substrs=['isp = 123'])
+ self.expect("frame variable ssp", substrs=['ssp = "foobar"'])
+
+ self.expect("frame variable nwp", substrs=['nwp = nullptr'])
+ self.expect("frame variable iwp", substrs=['iwp = 123'])
+ self.expect("frame variable swp", substrs=['swp = "foobar"'])
- self.expect("frame variable nsp", substrs = ['nsp = nullptr'])
- self.expect("frame variable isp", substrs = ['isp = 123'])
- self.expect("frame variable ssp", substrs = ['ssp = "foobar"'])
-
- self.expect("frame variable nwp", substrs = ['nwp = nullptr'])
- self.expect("frame variable iwp", substrs = ['iwp = 123'])
- self.expect("frame variable swp", substrs = ['swp = "foobar"'])
-
self.runCmd("continue")
- self.expect("frame variable nsp", substrs = ['nsp = nullptr'])
- self.expect("frame variable isp", substrs = ['isp = nullptr'])
- self.expect("frame variable ssp", substrs = ['ssp = nullptr'])
-
- self.expect("frame variable nwp", substrs = ['nwp = nullptr'])
- self.expect("frame variable iwp", substrs = ['iwp = nullptr'])
- self.expect("frame variable swp", substrs = ['swp = nullptr'])
+ self.expect("frame variable nsp", substrs=['nsp = nullptr'])
+ self.expect("frame variable isp", substrs=['isp = nullptr'])
+ self.expect("frame variable ssp", substrs=['ssp = nullptr'])
+
+ self.expect("frame variable nwp", substrs=['nwp = nullptr'])
+ self.expect("frame variable iwp", substrs=['iwp = nullptr'])
+ self.expect("frame variable swp", substrs=['swp = nullptr'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py Tue Sep 6 15:57:50 2016
@@ -1,4 +1,4 @@
-#coding=utf8
+# coding=utf8
"""
Test lldb data formatter subsystem.
"""
@@ -6,13 +6,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class StdStringDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,20 +24,21 @@ class StdStringDataFormatterTestCase(Tes
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- @skipIfWindows # libstdcpp not ported to Windows
+ @skipIfWindows # libstdcpp not ported to Windows
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)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -45,7 +47,9 @@ class StdStringDataFormatterTestCase(Tes
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)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
@@ -56,12 +60,22 @@ class StdStringDataFormatterTestCase(Tes
var_q = self.frame().FindVariable('q')
var_Q = self.frame().FindVariable('Q')
- self.assertTrue(var_s.GetSummary() == 'L"hello world! ××× ×××!"', "s summary wrong")
+ self.assertTrue(
+ var_s.GetSummary() == 'L"hello world! ××× ×××!"',
+ "s summary wrong")
self.assertTrue(var_S.GetSummary() == 'L"!!!!"', "S summary wrong")
- self.assertTrue(var_mazeltov.GetSummary() == 'L"××× ×××"', "mazeltov summary wrong")
- self.assertTrue(var_q.GetSummary() == '"hello world"', "q summary wrong")
- self.assertTrue(var_Q.GetSummary() == '"quite a long std::strin with lots of info inside it"', "Q summary wrong")
+ self.assertTrue(
+ var_mazeltov.GetSummary() == 'L"××× ×××"',
+ "mazeltov summary wrong")
+ self.assertTrue(
+ var_q.GetSummary() == '"hello world"',
+ "q summary wrong")
+ self.assertTrue(
+ var_Q.GetSummary() == '"quite a long std::strin with lots of info inside it"',
+ "Q summary wrong")
self.runCmd("next")
- self.assertTrue(var_S.GetSummary() == 'L"!!!!!"', "new S summary wrong")
+ self.assertTrue(
+ var_S.GetSummary() == 'L"!!!!!"',
+ "new S summary wrong")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class StdVBoolDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -22,23 +23,28 @@ class StdVBoolDataFormatterTestCase(Test
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set break point at this line.')
- @expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr20548 fails to build on lab.llvm.org buildbot')
- @expectedFailureAll(compiler="icc", bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
- @skipIfWindows # libstdcpp not ported to Windows.
+ @expectedFailureAll(
+ oslist=['freebsd'],
+ bugnumber='llvm.org/pr20548 fails to build on lab.llvm.org buildbot')
+ @expectedFailureAll(
+ compiler="icc",
+ bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
+ @skipIfWindows # libstdcpp not ported to Windows.
@skipIfDarwin
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)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -47,13 +53,33 @@ class StdVBoolDataFormatterTestCase(Test
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)
+ 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("frame variable vBool",
- substrs = ['size=49','[0] = false','[1] = true','[18] = false','[27] = true','[36] = false','[47] = true','[48] = true'])
-
- self.expect("expr vBool",
- substrs = ['size=49','[0] = false','[1] = true','[18] = false','[27] = true','[36] = false','[47] = true','[48] = true'])
+ self.expect(
+ "frame variable vBool",
+ substrs=[
+ 'size=49',
+ '[0] = false',
+ '[1] = true',
+ '[18] = false',
+ '[27] = true',
+ '[36] = false',
+ '[47] = true',
+ '[48] = true'])
+
+ self.expect(
+ "expr vBool",
+ substrs=[
+ 'size=49',
+ '[0] = false',
+ '[1] = true',
+ '[18] = false',
+ '[27] = true',
+ '[36] = false',
+ '[47] = true',
+ '[48] = true'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class StdVectorDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,21 +24,24 @@ class StdVectorDataFormatterTestCase(Tes
self.line = line_number('main.cpp', '// Set break point at this line.')
@skipIfFreeBSD
- @expectedFailureAll(compiler="icc", bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
- @skipIfWindows # libstdcpp not ported to Windows
+ @expectedFailureAll(
+ compiler="icc",
+ bugnumber="llvm.org/pr15301 LLDB prints incorrect sizes of STL containers")
+ @skipIfWindows # libstdcpp not ported to Windows
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)
- lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")
+ lldbutil.run_break_set_by_source_regexp(
+ self, "Set break point at this line.")
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -46,163 +50,171 @@ class StdVectorDataFormatterTestCase(Tes
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)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
# empty vectors (and storage pointers SHOULD BOTH BE NULL..)
self.expect("frame variable numbers",
- substrs = ['numbers = size=0'])
+ substrs=['numbers = size=0'])
self.runCmd("c")
-
+
# first value added
self.expect("frame variable numbers",
- substrs = ['numbers = size=1',
- '[0] = 1',
- '}'])
+ substrs=['numbers = size=1',
+ '[0] = 1',
+ '}'])
# add some more data
- self.runCmd("c");
-
+ self.runCmd("c")
+
self.expect("frame variable numbers",
- substrs = ['numbers = size=4',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '}'])
+ substrs=['numbers = size=4',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '}'])
self.expect("p numbers",
- substrs = ['$', 'size=4',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '}'])
+ substrs=['$', 'size=4',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '}'])
-
# check access to synthetic children
- self.runCmd("type summary add --summary-string \"item 0 is ${var[0]}\" std::int_vect int_vect")
+ self.runCmd(
+ "type summary add --summary-string \"item 0 is ${var[0]}\" std::int_vect int_vect")
self.expect('frame variable numbers',
- substrs = ['item 0 is 1']);
-
- self.runCmd("type summary add --summary-string \"item 0 is ${svar[0]}\" std::int_vect int_vect")
+ substrs=['item 0 is 1'])
+
+ self.runCmd(
+ "type summary add --summary-string \"item 0 is ${svar[0]}\" std::int_vect int_vect")
#import time
- #time.sleep(19)
+ # time.sleep(19)
self.expect('frame variable numbers',
- substrs = ['item 0 is 1']);
+ substrs=['item 0 is 1'])
# move on with synths
self.runCmd("type summary delete std::int_vect")
self.runCmd("type summary delete int_vect")
# add some more data
- self.runCmd("c");
+ self.runCmd("c")
self.expect("frame variable numbers",
- substrs = ['numbers = size=7',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '[4] = 12345',
- '[5] = 123456',
- '[6] = 1234567',
- '}'])
-
+ substrs=['numbers = size=7',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '[4] = 12345',
+ '[5] = 123456',
+ '[6] = 1234567',
+ '}'])
+
self.expect("p numbers",
- substrs = ['$', 'size=7',
- '[0] = 1',
- '[1] = 12',
- '[2] = 123',
- '[3] = 1234',
- '[4] = 12345',
- '[5] = 123456',
- '[6] = 1234567',
- '}'])
+ substrs=['$', 'size=7',
+ '[0] = 1',
+ '[1] = 12',
+ '[2] = 123',
+ '[3] = 1234',
+ '[4] = 12345',
+ '[5] = 123456',
+ '[6] = 1234567',
+ '}'])
# check access-by-index
self.expect("frame variable numbers[0]",
- substrs = ['1']);
+ substrs=['1'])
self.expect("frame variable numbers[1]",
- substrs = ['12']);
+ substrs=['12'])
self.expect("frame variable numbers[2]",
- substrs = ['123']);
+ substrs=['123'])
self.expect("frame variable numbers[3]",
- substrs = ['1234']);
-
+ substrs=['1234'])
+
# but check that expression does not rely on us
# (when expression gets to call into STL code correctly, we will have to find
# another way to check this)
self.expect("expression numbers[6]", matching=False, error=True,
- substrs = ['1234567'])
+ substrs=['1234567'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("numbers").MightHaveChildren(), "numbers.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("numbers").MightHaveChildren(),
+ "numbers.MightHaveChildren() says False for non empty!")
# clear out the vector and see that we do the right thing once again
self.runCmd("c")
self.expect("frame variable numbers",
- substrs = ['numbers = size=0'])
+ substrs=['numbers = size=0'])
self.runCmd("c")
# first value added
self.expect("frame variable numbers",
- substrs = ['numbers = size=1',
- '[0] = 7',
- '}'])
+ substrs=['numbers = size=1',
+ '[0] = 7',
+ '}'])
# check if we can display strings
self.runCmd("c")
self.expect("frame variable strings",
- substrs = ['goofy',
- 'is',
- 'smart'])
+ substrs=['goofy',
+ 'is',
+ 'smart'])
self.expect("p strings",
- substrs = ['goofy',
- 'is',
- 'smart'])
+ substrs=['goofy',
+ 'is',
+ 'smart'])
# test summaries based on synthetic children
- self.runCmd("type summary add std::string_vect string_vect --summary-string \"vector has ${svar%#} items\" -e")
+ self.runCmd(
+ "type summary add std::string_vect string_vect --summary-string \"vector has ${svar%#} items\" -e")
self.expect("frame variable strings",
- substrs = ['vector has 3 items',
- 'goofy',
- 'is',
- 'smart'])
+ substrs=['vector has 3 items',
+ 'goofy',
+ 'is',
+ 'smart'])
self.expect("p strings",
- substrs = ['vector has 3 items',
- 'goofy',
- 'is',
- 'smart'])
+ substrs=['vector has 3 items',
+ 'goofy',
+ 'is',
+ 'smart'])
- self.runCmd("c");
+ self.runCmd("c")
self.expect("frame variable strings",
- substrs = ['vector has 4 items'])
-
+ substrs=['vector has 4 items'])
+
# check access-by-index
self.expect("frame variable strings[0]",
- substrs = ['goofy']);
+ substrs=['goofy'])
self.expect("frame variable strings[1]",
- substrs = ['is']);
-
+ substrs=['is'])
+
# but check that expression does not rely on us
# (when expression gets to call into STL code correctly, we will have to find
# another way to check this)
self.expect("expression strings[0]", matching=False, error=True,
- substrs = ['goofy'])
+ substrs=['goofy'])
# check that MightHaveChildren() gets it right
- self.assertTrue(self.frame().FindVariable("strings").MightHaveChildren(), "strings.MightHaveChildren() says False for non empty!")
+ self.assertTrue(
+ self.frame().FindVariable("strings").MightHaveChildren(),
+ "strings.MightHaveChildren() says False for non empty!")
self.runCmd("c")
self.expect("frame variable strings",
- substrs = ['vector has 0 items'])
+ substrs=['vector has 0 items'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class SynthDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,14 +27,15 @@ class SynthDataFormatterTestCase(TestBas
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -48,158 +50,171 @@ class SynthDataFormatterTestCase(TestBas
# Pick some values and check that the basics work
self.runCmd("type filter add BagOfInts --child x --child z")
self.expect("frame variable int_bag",
- substrs = ['x = 6',
- 'z = 8'])
+ substrs=['x = 6',
+ 'z = 8'])
# Check we can still access the missing child by summary
- self.runCmd("type summary add BagOfInts --summary-string \"y=${var.y}\"")
+ self.runCmd(
+ "type summary add BagOfInts --summary-string \"y=${var.y}\"")
self.expect('frame variable int_bag',
- substrs = ['y=7'])
-
- # Even if we have synth children, the summary prevails
+ substrs=['y=7'])
+
+ # Even if we have synth children, the summary prevails
self.expect("frame variable int_bag", matching=False,
- substrs = ['x = 6',
- 'z = 8'])
-
+ substrs=['x = 6',
+ 'z = 8'])
+
# if we skip synth and summary show y
- self.expect("frame variable int_bag --synthetic-type false --no-summary-depth=1",
- substrs = ['x = 6',
- 'y = 7',
- 'z = 8'])
-
+ self.expect(
+ "frame variable int_bag --synthetic-type false --no-summary-depth=1",
+ substrs=[
+ 'x = 6',
+ 'y = 7',
+ 'z = 8'])
+
# if we ask for raw output same happens
self.expect("frame variable int_bag --raw-output",
- substrs = ['x = 6',
- 'y = 7',
- 'z = 8'])
-
+ substrs=['x = 6',
+ 'y = 7',
+ 'z = 8'])
+
# Summary+Synth must work together
- self.runCmd("type summary add BagOfInts --summary-string \"x=${var.x}\" -e")
+ self.runCmd(
+ "type summary add BagOfInts --summary-string \"x=${var.x}\" -e")
self.expect('frame variable int_bag',
- substrs = ['x=6',
- 'x = 6',
- 'z = 8'])
-
+ substrs=['x=6',
+ 'x = 6',
+ 'z = 8'])
+
# Same output, but using Python
- self.runCmd("type summary add BagOfInts --python-script \"return 'x=%s' % valobj.GetChildMemberWithName('x').GetValue()\" -e")
+ self.runCmd(
+ "type summary add BagOfInts --python-script \"return 'x=%s' % valobj.GetChildMemberWithName('x').GetValue()\" -e")
self.expect('frame variable int_bag',
- substrs = ['x=6',
- 'x = 6',
- 'z = 8'])
+ substrs=['x=6',
+ 'x = 6',
+ 'z = 8'])
# If I skip summaries, still give me the artificial children
self.expect("frame variable int_bag --no-summary-depth=1",
- substrs = ['x = 6',
- 'z = 8'])
+ substrs=['x = 6',
+ 'z = 8'])
# Delete synth and check that the view reflects it immediately
self.runCmd("type filter delete BagOfInts")
self.expect("frame variable int_bag",
- substrs = ['x = 6',
- 'y = 7',
- 'z = 8'])
+ substrs=['x = 6',
+ 'y = 7',
+ 'z = 8'])
- # Add the synth again and check that it's honored deeper in the hierarchy
+ # Add the synth again and check that it's honored deeper in the
+ # hierarchy
self.runCmd("type filter add BagOfInts --child x --child z")
self.expect('frame variable bag_bag',
- substrs = ['x = x=69 {',
- 'x = 69',
- 'z = 71',
- 'y = x=66 {',
- 'x = 66',
- 'z = 68'])
+ substrs=['x = x=69 {',
+ 'x = 69',
+ 'z = 71',
+ 'y = x=66 {',
+ 'x = 66',
+ 'z = 68'])
self.expect('frame variable bag_bag', matching=False,
- substrs = ['y = 70',
- 'y = 67'])
+ substrs=['y = 70',
+ 'y = 67'])
# Check that a synth can expand nested stuff
self.runCmd("type filter add BagOfBags --child x.y --child y.z")
self.expect('frame variable bag_bag',
- substrs = ['x.y = 70',
- 'y.z = 68'])
+ substrs=['x.y = 70',
+ 'y.z = 68'])
# ...even if we get -> and . wrong
self.runCmd("type filter add BagOfBags --child x.y --child \"y->z\"")
self.expect('frame variable bag_bag',
- substrs = ['x.y = 70',
- 'y->z = 68'])
+ substrs=['x.y = 70',
+ 'y->z = 68'])
# ...even bitfields
- self.runCmd("type filter add BagOfBags --child x.y --child \"y->z[1-2]\"")
+ self.runCmd(
+ "type filter add BagOfBags --child x.y --child \"y->z[1-2]\"")
self.expect('frame variable bag_bag --show-types',
- substrs = ['x.y = 70',
- '(int:2) y->z[1-2] = 2'])
+ substrs=['x.y = 70',
+ '(int:2) y->z[1-2] = 2'])
# ...even if we format the bitfields
- self.runCmd("type filter add BagOfBags --child x.y --child \"y->y[0-0]\"")
+ self.runCmd(
+ "type filter add BagOfBags --child x.y --child \"y->y[0-0]\"")
self.runCmd("type format add \"int:1\" -f bool")
self.expect('frame variable bag_bag --show-types',
- substrs = ['x.y = 70',
- '(int:1) y->y[0-0] = true'])
-
+ substrs=['x.y = 70',
+ '(int:1) y->y[0-0] = true'])
+
# ...even if we use one-liner summaries
self.runCmd("type summary add -c BagOfBags")
- self.expect('frame variable bag_bag',
- substrs = ['(BagOfBags) bag_bag = (x.y = 70, y->y[0-0] = true)'])
-
+ self.expect('frame variable bag_bag', substrs=[
+ '(BagOfBags) bag_bag = (x.y = 70, y->y[0-0] = true)'])
+
self.runCmd("type summary delete BagOfBags")
# now check we are dynamic (and arrays work)
- self.runCmd("type filter add Plenty --child bitfield --child array[0] --child array[2]")
+ self.runCmd(
+ "type filter add Plenty --child bitfield --child array[0] --child array[2]")
self.expect('frame variable plenty_of_stuff',
- substrs = ['bitfield = 1',
- 'array[0] = 5',
- 'array[2] = 3'])
-
+ substrs=['bitfield = 1',
+ 'array[0] = 5',
+ 'array[2] = 3'])
+
self.runCmd("n")
self.expect('frame variable plenty_of_stuff',
- substrs = ['bitfield = 17',
- 'array[0] = 5',
- 'array[2] = 3'])
-
+ substrs=['bitfield = 17',
+ 'array[0] = 5',
+ 'array[2] = 3'])
+
# skip synthetic children
self.expect('frame variable plenty_of_stuff --synthetic-type no',
- substrs = ['some_values = 0x',
- 'array = 0x',
- 'array_size = 5'])
+ substrs=['some_values = 0x',
+ 'array = 0x',
+ 'array_size = 5'])
-
# check flat printing with synthetic children
self.expect('frame variable plenty_of_stuff --flat',
- substrs = ['plenty_of_stuff.bitfield = 17',
- '*(plenty_of_stuff.array) = 5',
- '*(plenty_of_stuff.array) = 3'])
-
+ substrs=['plenty_of_stuff.bitfield = 17',
+ '*(plenty_of_stuff.array) = 5',
+ '*(plenty_of_stuff.array) = 3'])
+
# check that we do not lose location information for our children
self.expect('frame variable plenty_of_stuff --location',
- substrs = ['0x',
- ': bitfield = 17'])
+ substrs=['0x',
+ ': bitfield = 17'])
# check we work across pointer boundaries
self.expect('frame variable plenty_of_stuff.some_values --ptr-depth=1',
- substrs = ['(BagOfInts *) plenty_of_stuff.some_values',
- 'x = 5',
- 'z = 7'])
+ substrs=['(BagOfInts *) plenty_of_stuff.some_values',
+ 'x = 5',
+ 'z = 7'])
# but not if we don't want to
self.runCmd("type filter add BagOfInts --child x --child z -p")
self.expect('frame variable plenty_of_stuff.some_values --ptr-depth=1',
- substrs = ['(BagOfInts *) plenty_of_stuff.some_values',
- 'x = 5',
- 'y = 6',
- 'z = 7'])
+ substrs=['(BagOfInts *) plenty_of_stuff.some_values',
+ 'x = 5',
+ 'y = 6',
+ 'z = 7'])
# check we're dynamic even if nested
self.runCmd("type filter add BagOfBags --child x.z")
self.expect('frame variable bag_bag',
- substrs = ['x.z = 71'])
+ substrs=['x.z = 71'])
self.runCmd("n")
self.expect('frame variable bag_bag',
- substrs = ['x.z = 12'])
+ substrs=['x.z = 12'])
- self.runCmd('type summary add -e -s "I am always empty but have" EmptyStruct')
- self.expect('frame variable es', substrs = ["I am always empty but have {}"])
+ self.runCmd(
+ 'type summary add -e -s "I am always empty but have" EmptyStruct')
+ self.expect('frame variable es', substrs=[
+ "I am always empty but have {}"])
self.runCmd('type summary add -e -h -s "I am really empty" EmptyStruct')
- self.expect('frame variable es', substrs = ["I am really empty"])
- self.expect('frame variable es', substrs = ["I am really empty {}"], matching=False)
+ self.expect('frame variable es', substrs=["I am really empty"])
+ self.expect(
+ 'frame variable es',
+ substrs=["I am really empty {}"],
+ matching=False)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/TestDataFormatterSynthType.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DataFormatterSynthTypeTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -22,20 +23,21 @@ class DataFormatterSynthTypeTestCase(Tes
# Find the line number to break at.
self.line = line_number('main.cpp', 'break here')
- @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
+ @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
def test_with_run_command(self):
"""Test using Python synthetic children provider to provide a typename."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/myIntSynthProvider.py Tue Sep 6 15:57:50 2016
@@ -1,22 +1,30 @@
class myIntSynthProvider(object):
- def __init__(self, valobj, dict):
- self.valobj = valobj;
- self.val = self.valobj.GetChildMemberWithName("theValue")
- def num_children(self):
- return 0;
- def get_child_at_index(self, index):
- return None
- def get_child_index(self, name):
- return None
- def update(self):
- return False
- def has_children(self):
- return False
- def get_type_name(self):
- return "ThisTestPasses"
+
+ def __init__(self, valobj, dict):
+ self.valobj = valobj
+ self.val = self.valobj.GetChildMemberWithName("theValue")
+
+ def num_children(self):
+ return 0
+
+ def get_child_at_index(self, index):
+ return None
+
+ def get_child_index(self, name):
+ return None
+
+ def update(self):
+ return False
+
+ def has_children(self):
+ return False
+
+ def get_type_name(self):
+ return "ThisTestPasses"
class myArraySynthProvider(object):
+
def __init__(self, valobj, dict):
self.valobj = valobj
self.array = self.valobj.GetChildMemberWithName("array")
@@ -27,10 +35,10 @@ class myArraySynthProvider(object):
return max_count
def get_child_at_index(self, index):
- return None # Keep it simple when this is not tested here.
+ return None # Keep it simple when this is not tested here.
def get_child_index(self, name):
- return None # Keep it simple when this is not tested here.
+ return None # Keep it simple when this is not tested here.
def has_children(self):
return True
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DataFormatterSynthValueTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -22,21 +23,24 @@ class DataFormatterSynthValueTestCase(Te
# Find the line number to break at.
self.line = line_number('main.cpp', 'break here')
- @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
+ @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24462, Data formatters have problems on Windows")
def test_with_run_command(self):
"""Test using Python synthetic children provider to provide a value."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -48,7 +52,7 @@ class DataFormatterSynthValueTestCase(Te
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
-
+
x = self.frame().FindVariable("x")
x.SetPreferSyntheticValue(True)
y = self.frame().FindVariable("y")
@@ -62,9 +66,11 @@ class DataFormatterSynthValueTestCase(Te
y_val = y.GetValueAsUnsigned
z_val = z.GetValueAsUnsigned
q_val = q.GetValueAsUnsigned
-
+
if self.TraceOn():
- print("x_val = %s; y_val = %s; z_val = %s; q_val = %s" % (x_val(),y_val(),z_val(),q_val()))
+ print(
+ "x_val = %s; y_val = %s; z_val = %s; q_val = %s" %
+ (x_val(), y_val(), z_val(), q_val()))
self.assertFalse(x_val() == 3, "x == 3 before synthetics")
self.assertFalse(y_val() == 4, "y == 4 before synthetics")
@@ -76,23 +82,34 @@ class DataFormatterSynthValueTestCase(Te
self.runCmd("type synth add -l myIntSynthProvider myInt")
self.runCmd("type synth add -l myArraySynthProvider myArray")
self.runCmd("type synth add -l myIntSynthProvider myIntAndStuff")
-
+
if self.TraceOn():
- print("x_val = %s; y_val = %s; z_val = %s; q_val = %s" % (x_val(),y_val(),z_val(),q_val()))
-
+ print(
+ "x_val = %s; y_val = %s; z_val = %s; q_val = %s" %
+ (x_val(), y_val(), z_val(), q_val()))
+
self.assertTrue(x_val() == 3, "x != 3 after synthetics")
self.assertTrue(y_val() == 4, "y != 4 after synthetics")
self.assertTrue(z_val() == 7, "z != 7 after synthetics")
self.assertTrue(q_val() == 8, "q != 8 after synthetics")
-
+
self.expect("frame variable x", substrs=['3'])
- self.expect("frame variable x", substrs=['theValue = 3'], matching=False)
+ self.expect(
+ "frame variable x",
+ substrs=['theValue = 3'],
+ matching=False)
self.expect("frame variable q", substrs=['8'])
- self.expect("frame variable q", substrs=['theValue = 8'], matching=False)
-
- # check that an aptly defined synthetic provider does not affect one-lining
- self.expect("expression struct S { myInt theInt{12}; }; S()", substrs = ['(theInt = 12)'])
-
+ self.expect(
+ "frame variable q",
+ substrs=['theValue = 8'],
+ matching=False)
+
+ # check that an aptly defined synthetic provider does not affect
+ # one-lining
+ self.expect(
+ "expression struct S { myInt theInt{12}; }; S()",
+ substrs=['(theInt = 12)'])
+
# check that we can use a synthetic value in a summary
self.runCmd("type summary add hasAnInt -s ${var.theInt}")
hi = self.frame().FindVariable("hi")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py Tue Sep 6 15:57:50 2016
@@ -1,22 +1,30 @@
class myIntSynthProvider(object):
- def __init__(self, valobj, dict):
- self.valobj = valobj;
- self.val = self.valobj.GetChildMemberWithName("theValue")
- def num_children(self):
- return 0;
- def get_child_at_index(self, index):
- return None
- def get_child_index(self, name):
- return None
- def update(self):
- return False
- def has_children(self):
- return False
- def get_value(self):
- return self.val
+
+ def __init__(self, valobj, dict):
+ self.valobj = valobj
+ self.val = self.valobj.GetChildMemberWithName("theValue")
+
+ def num_children(self):
+ return 0
+
+ def get_child_at_index(self, index):
+ return None
+
+ def get_child_index(self, name):
+ return None
+
+ def update(self):
+ return False
+
+ def has_children(self):
+ return False
+
+ def get_value(self):
+ return self.val
class myArraySynthProvider(object):
+
def __init__(self, valobj, dict):
self.valobj = valobj
self.array = self.valobj.GetChildMemberWithName("array")
@@ -27,10 +35,10 @@ class myArraySynthProvider(object):
return max_count
def get_child_at_index(self, index):
- return None # Keep it simple when this is not tested here.
+ return None # Keep it simple when this is not tested here.
def get_child_index(self, name):
- return None # Keep it simple when this is not tested here.
+ return None # Keep it simple when this is not tested here.
def has_children(self):
return True
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py Tue Sep 6 15:57:50 2016
@@ -2,4 +2,7 @@ from __future__ import absolute_import
from lldbsuite.test import lldbinline
-lldbinline.MakeInlineTest(__file__, globals(), [lldbinline.expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24663")])
+lldbinline.MakeInlineTest(
+ __file__, globals(), [
+ lldbinline.expectedFailureAll(
+ oslist=["windows"], bugnumber="llvm.org/pr24663")])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Check if changing Format on an SBValue c
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class FormatPropagationTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -27,14 +28,15 @@ class FormatPropagationTestCase(TestBase
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -47,18 +49,24 @@ class FormatPropagationTestCase(TestBase
# extract the parent and the children
frame = self.frame()
parent = self.frame().FindVariable("f")
- self.assertTrue(parent != None and parent.IsValid(),"could not find f")
+ self.assertTrue(
+ parent is not None and parent.IsValid(),
+ "could not find f")
X = parent.GetChildMemberWithName("X")
- self.assertTrue(X != None and X.IsValid(),"could not find X")
+ self.assertTrue(X is not None and X.IsValid(), "could not find X")
Y = parent.GetChildMemberWithName("Y")
- self.assertTrue(Y != None and Y.IsValid(),"could not find Y")
+ self.assertTrue(Y is not None and Y.IsValid(), "could not find Y")
# check their values now
self.assertTrue(X.GetValue() == "1", "X has an invalid value")
self.assertTrue(Y.GetValue() == "2", "Y has an invalid value")
# set the format on the parent
parent.SetFormat(lldb.eFormatHex)
- self.assertTrue(X.GetValue() == "0x00000001", "X has not changed format")
- self.assertTrue(Y.GetValue() == "0x00000002", "Y has not changed format")
+ self.assertTrue(
+ X.GetValue() == "0x00000001",
+ "X has not changed format")
+ self.assertTrue(
+ Y.GetValue() == "0x00000002",
+ "Y has not changed format")
# Step and check if the values make sense still
self.runCmd("next")
self.assertTrue(X.GetValue() == "0x00000004", "X has not become 4")
@@ -71,5 +79,7 @@ class FormatPropagationTestCase(TestBase
parent.SetFormat(lldb.eFormatDefault)
X.SetFormat(lldb.eFormatHex)
Y.SetFormat(lldb.eFormatDefault)
- self.assertTrue(X.GetValue() == "0x00000004", "X is not hex as it asked")
+ self.assertTrue(
+ X.GetValue() == "0x00000004",
+ "X is not hex as it asked")
self.assertTrue(Y.GetValue() == "2", "Y is not defaulted")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test that the user can input a format bu
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class FrameFormatSmallStructTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,13 +27,14 @@ class FrameFormatSmallStructTestCase(Tes
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
- self.expect("thread list", substrs = ['addPair(p=(x = 3, y = -3))'])
+ self.expect("thread list", substrs=['addPair(p=(x = 3, y = -3))'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class DataFormatterHexCapsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,14 +27,15 @@ class DataFormatterHexCapsTestCase(TestB
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -45,38 +47,43 @@ class DataFormatterHexCapsTestCase(TestB
self.addTearDownHook(cleanup)
self.runCmd("type format add -f uppercase int")
-
+
self.expect('frame variable mine',
- substrs = ['mine = ',
- 'first = 0x001122AA', 'second = 0x1122BB44'])
+ substrs=['mine = ',
+ 'first = 0x001122AA', 'second = 0x1122BB44'])
self.runCmd("type format add -f hex int")
self.expect('frame variable mine',
- substrs = ['mine = ',
- 'first = 0x001122aa', 'second = 0x1122bb44'])
+ substrs=['mine = ',
+ 'first = 0x001122aa', 'second = 0x1122bb44'])
self.runCmd("type format delete int")
- self.runCmd("type summary add -s \"${var.first%X} and ${var.second%x}\" foo")
+ self.runCmd(
+ "type summary add -s \"${var.first%X} and ${var.second%x}\" foo")
self.expect('frame variable mine',
- substrs = ['(foo) mine = 0x001122AA and 0x1122bb44'])
+ substrs=['(foo) mine = 0x001122AA and 0x1122bb44'])
- self.runCmd("type summary add -s \"${var.first%X} and ${var.second%X}\" foo")
+ self.runCmd(
+ "type summary add -s \"${var.first%X} and ${var.second%X}\" foo")
self.runCmd("next")
self.runCmd("next")
self.expect('frame variable mine',
- substrs = ['(foo) mine = 0xAABBCCDD and 0x1122BB44'])
+ substrs=['(foo) mine = 0xAABBCCDD and 0x1122BB44'])
- self.runCmd("type summary add -s \"${var.first%x} and ${var.second%X}\" foo")
+ self.runCmd(
+ "type summary add -s \"${var.first%x} and ${var.second%X}\" foo")
self.expect('frame variable mine',
- substrs = ['(foo) mine = 0xaabbccdd and 0x1122BB44'])
+ substrs=['(foo) mine = 0xaabbccdd and 0x1122BB44'])
self.runCmd("next")
self.runCmd("next")
- self.runCmd("type summary add -s \"${var.first%x} and ${var.second%x}\" foo")
+ self.runCmd(
+ "type summary add -s \"${var.first%x} and ${var.second%x}\" foo")
self.expect('frame variable mine',
- substrs = ['(foo) mine = 0xaabbccdd and 0xff00ff00'])
- self.runCmd("type summary add -s \"${var.first%X} and ${var.second%X}\" foo")
+ substrs=['(foo) mine = 0xaabbccdd and 0xff00ff00'])
+ self.runCmd(
+ "type summary add -s \"${var.first%X} and ${var.second%X}\" foo")
self.expect('frame variable mine',
- substrs = ['(foo) mine = 0xAABBCCDD and 0xFF00FF00'])
+ substrs=['(foo) mine = 0xAABBCCDD and 0xFF00FF00'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/TestDataFormatterLanguageCategoryUpdates.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class LanguageCategoryUpdatesTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,7 +27,11 @@ class LanguageCategoryUpdatesTestCase(Te
# This is the function to remove the custom formats in order to have a
# clean slate for the next test case.
def cleanup():
- if hasattr(self, 'type_category') and hasattr(self, 'type_specifier'):
+ if hasattr(
+ self,
+ 'type_category') and hasattr(
+ self,
+ 'type_specifier'):
self.type_category.DeleteTypeSummary(self.type_specifier)
# Execute the cleanup function during test case tear down.
@@ -35,25 +40,47 @@ class LanguageCategoryUpdatesTestCase(Te
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
- self.expect("frame variable", substrs = ['(S)', 'object', '123', '456'], matching=True)
-
- self.type_category = self.dbg.GetCategory(lldb.eLanguageTypeC_plus_plus)
- type_summary = lldb.SBTypeSummary.CreateWithSummaryString("this is an object of type S")
+ self.expect(
+ "frame variable",
+ substrs=[
+ '(S)',
+ 'object',
+ '123',
+ '456'],
+ matching=True)
+
+ self.type_category = self.dbg.GetCategory(
+ lldb.eLanguageTypeC_plus_plus)
+ type_summary = lldb.SBTypeSummary.CreateWithSummaryString(
+ "this is an object of type S")
self.type_specifier = lldb.SBTypeNameSpecifier('S')
self.type_category.AddTypeSummary(self.type_specifier, type_summary)
- self.expect("frame variable", substrs = ['this is an object of type S'], matching=True)
-
- self.type_category.DeleteTypeSummary(self.type_specifier)
- self.expect("frame variable", substrs = ['this is an object of type S'], matching=False)
- self.expect("frame variable", substrs = ['(S)', 'object', '123', '456'], matching=True)
+ self.expect(
+ "frame variable",
+ substrs=['this is an object of type S'],
+ matching=True)
+ self.type_category.DeleteTypeSummary(self.type_specifier)
+ self.expect(
+ "frame variable",
+ substrs=['this is an object of type S'],
+ matching=False)
+ self.expect(
+ "frame variable",
+ substrs=[
+ '(S)',
+ 'object',
+ '123',
+ '456'],
+ matching=True)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class NSArraySyntheticTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,14 +30,15 @@ class NSArraySyntheticTestCase(TestBase)
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -50,19 +52,59 @@ class NSArraySyntheticTestCase(TestBase)
# Now check that we are displaying Cocoa classes correctly
self.expect('frame variable arr',
- substrs = ['@"6 elements"'])
+ substrs=['@"6 elements"'])
self.expect('frame variable other_arr',
- substrs = ['@"4 elements"'])
- self.expect('frame variable arr --ptr-depth 1',
- substrs = ['@"6 elements"','[0] = 0x','[1] = 0x','[2] = 0x','[3] = 0x','[4] = 0x','[5] = 0x'])
- self.expect('frame variable other_arr --ptr-depth 1',
- substrs = ['@"4 elements"','[0] = 0x','[1] = 0x','[2] = 0x','[3] = 0x'])
- self.expect('frame variable arr --ptr-depth 1 -d no-run-target',
- substrs = ['@"6 elements"','@"hello"','@"world"','@"this"','@"is"','@"me"','@"http://www.apple.com'])
- self.expect('frame variable other_arr --ptr-depth 1 -d no-run-target',
- substrs = ['@"4 elements"','(int)5','@"a string"','@"6 elements"'])
- self.expect('frame variable other_arr --ptr-depth 2 -d no-run-target',
- substrs = ['@"4 elements"','@"6 elements" {','@"hello"','@"world"','@"this"','@"is"','@"me"','@"http://www.apple.com'])
-
- self.assertTrue(self.frame().FindVariable("arr").MightHaveChildren(), "arr says it does not have children!")
- self.assertTrue(self.frame().FindVariable("other_arr").MightHaveChildren(), "arr says it does not have children!")
+ substrs=['@"4 elements"'])
+ self.expect(
+ 'frame variable arr --ptr-depth 1',
+ substrs=[
+ '@"6 elements"',
+ '[0] = 0x',
+ '[1] = 0x',
+ '[2] = 0x',
+ '[3] = 0x',
+ '[4] = 0x',
+ '[5] = 0x'])
+ self.expect(
+ 'frame variable other_arr --ptr-depth 1',
+ substrs=[
+ '@"4 elements"',
+ '[0] = 0x',
+ '[1] = 0x',
+ '[2] = 0x',
+ '[3] = 0x'])
+ self.expect(
+ 'frame variable arr --ptr-depth 1 -d no-run-target',
+ substrs=[
+ '@"6 elements"',
+ '@"hello"',
+ '@"world"',
+ '@"this"',
+ '@"is"',
+ '@"me"',
+ '@"http://www.apple.com'])
+ self.expect(
+ 'frame variable other_arr --ptr-depth 1 -d no-run-target',
+ substrs=[
+ '@"4 elements"',
+ '(int)5',
+ '@"a string"',
+ '@"6 elements"'])
+ self.expect(
+ 'frame variable other_arr --ptr-depth 2 -d no-run-target',
+ substrs=[
+ '@"4 elements"',
+ '@"6 elements" {',
+ '@"hello"',
+ '@"world"',
+ '@"this"',
+ '@"is"',
+ '@"me"',
+ '@"http://www.apple.com'])
+
+ self.assertTrue(
+ self.frame().FindVariable("arr").MightHaveChildren(),
+ "arr says it does not have children!")
+ self.assertTrue(
+ self.frame().FindVariable("other_arr").MightHaveChildren(),
+ "arr says it does not have children!")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class NSDictionarySyntheticTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,14 +30,15 @@ class NSDictionarySyntheticTestCase(Test
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -50,21 +52,73 @@ class NSDictionarySyntheticTestCase(Test
# Now check that we are displaying Cocoa classes correctly
self.expect('frame variable dictionary',
- substrs = ['3 key/value pairs'])
+ substrs=['3 key/value pairs'])
self.expect('frame variable mutabledict',
- substrs = ['4 key/value pairs'])
- self.expect('frame variable dictionary --ptr-depth 1',
- substrs = ['3 key/value pairs','[0] = ','key = 0x','value = 0x','[1] = ','[2] = '])
- self.expect('frame variable mutabledict --ptr-depth 1',
- substrs = ['4 key/value pairs','[0] = ','key = 0x','value = 0x','[1] = ','[2] = ','[3] = '])
- self.expect('frame variable dictionary --ptr-depth 1 --dynamic-type no-run-target',
- substrs = ['3 key/value pairs','@"bar"','@"2 elements"','@"baz"','2 key/value pairs'])
- self.expect('frame variable mutabledict --ptr-depth 1 --dynamic-type no-run-target',
- substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"sourceofstuff"','3 key/value pairs'])
- self.expect('frame variable mutabledict --ptr-depth 2 --dynamic-type no-run-target',
- substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"sourceofstuff"','3 key/value pairs','@"bar"','@"2 elements"'])
- self.expect('frame variable mutabledict --ptr-depth 3 --dynamic-type no-run-target',
- substrs = ['4 key/value pairs','(int)23','@"123"','@"http://www.apple.com"','@"sourceofstuff"','3 key/value pairs','@"bar"','@"2 elements"','(int)1','@"two"'])
-
- self.assertTrue(self.frame().FindVariable("dictionary").MightHaveChildren(), "dictionary says it does not have children!")
- self.assertTrue(self.frame().FindVariable("mutabledict").MightHaveChildren(), "mutable says it does not have children!")
+ substrs=['4 key/value pairs'])
+ self.expect(
+ 'frame variable dictionary --ptr-depth 1',
+ substrs=[
+ '3 key/value pairs',
+ '[0] = ',
+ 'key = 0x',
+ 'value = 0x',
+ '[1] = ',
+ '[2] = '])
+ self.expect(
+ 'frame variable mutabledict --ptr-depth 1',
+ substrs=[
+ '4 key/value pairs',
+ '[0] = ',
+ 'key = 0x',
+ 'value = 0x',
+ '[1] = ',
+ '[2] = ',
+ '[3] = '])
+ self.expect(
+ 'frame variable dictionary --ptr-depth 1 --dynamic-type no-run-target',
+ substrs=[
+ '3 key/value pairs',
+ '@"bar"',
+ '@"2 elements"',
+ '@"baz"',
+ '2 key/value pairs'])
+ self.expect(
+ 'frame variable mutabledict --ptr-depth 1 --dynamic-type no-run-target',
+ substrs=[
+ '4 key/value pairs',
+ '(int)23',
+ '@"123"',
+ '@"http://www.apple.com"',
+ '@"sourceofstuff"',
+ '3 key/value pairs'])
+ self.expect(
+ 'frame variable mutabledict --ptr-depth 2 --dynamic-type no-run-target',
+ substrs=[
+ '4 key/value pairs',
+ '(int)23',
+ '@"123"',
+ '@"http://www.apple.com"',
+ '@"sourceofstuff"',
+ '3 key/value pairs',
+ '@"bar"',
+ '@"2 elements"'])
+ self.expect(
+ 'frame variable mutabledict --ptr-depth 3 --dynamic-type no-run-target',
+ substrs=[
+ '4 key/value pairs',
+ '(int)23',
+ '@"123"',
+ '@"http://www.apple.com"',
+ '@"sourceofstuff"',
+ '3 key/value pairs',
+ '@"bar"',
+ '@"2 elements"',
+ '(int)1',
+ '@"two"'])
+
+ self.assertTrue(
+ self.frame().FindVariable("dictionary").MightHaveChildren(),
+ "dictionary says it does not have children!")
+ self.assertTrue(
+ self.frame().FindVariable("mutabledict").MightHaveChildren(),
+ "mutable says it does not have children!")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class NSSetSyntheticTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,14 +30,15 @@ class NSSetSyntheticTestCase(TestBase):
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -50,26 +52,64 @@ class NSSetSyntheticTestCase(TestBase):
# Now check that we are displaying Cocoa classes correctly
self.expect('frame variable set',
- substrs = ['4 elements'])
+ substrs=['4 elements'])
self.expect('frame variable mutable',
- substrs = ['9 elements'])
- self.expect('frame variable set --ptr-depth 1 -d run -T',
- substrs = ['4 elements','[0]','[1]','[2]','[3]','hello','world','(int)1','(int)2'])
- self.expect('frame variable mutable --ptr-depth 1 -d run -T',
- substrs = ['9 elements','(int)5','@"3 elements"','@"www.apple.com"','(int)3','@"world"','(int)4'])
+ substrs=['9 elements'])
+ self.expect(
+ 'frame variable set --ptr-depth 1 -d run -T',
+ substrs=[
+ '4 elements',
+ '[0]',
+ '[1]',
+ '[2]',
+ '[3]',
+ 'hello',
+ 'world',
+ '(int)1',
+ '(int)2'])
+ self.expect(
+ 'frame variable mutable --ptr-depth 1 -d run -T',
+ substrs=[
+ '9 elements',
+ '(int)5',
+ '@"3 elements"',
+ '@"www.apple.com"',
+ '(int)3',
+ '@"world"',
+ '(int)4'])
self.runCmd("next")
self.expect('frame variable mutable',
- substrs = ['0 elements'])
+ substrs=['0 elements'])
self.runCmd("next")
self.expect('frame variable mutable',
- substrs = ['4 elements'])
- self.expect('frame variable mutable --ptr-depth 1 -d run -T',
- substrs = ['4 elements','[0]','[1]','[2]','[3]','hello','world','(int)1','(int)2'])
+ substrs=['4 elements'])
+ self.expect(
+ 'frame variable mutable --ptr-depth 1 -d run -T',
+ substrs=[
+ '4 elements',
+ '[0]',
+ '[1]',
+ '[2]',
+ '[3]',
+ 'hello',
+ 'world',
+ '(int)1',
+ '(int)2'])
self.runCmd("next")
self.expect('frame variable mutable',
- substrs = ['4 elements'])
- self.expect('frame variable mutable --ptr-depth 1 -d run -T',
- substrs = ['4 elements','[0]','[1]','[2]','[3]','hello','world','(int)1','(int)2'])
+ substrs=['4 elements'])
+ self.expect(
+ 'frame variable mutable --ptr-depth 1 -d run -T',
+ substrs=[
+ '4 elements',
+ '[0]',
+ '[1]',
+ '[2]',
+ '[3]',
+ 'hello',
+ 'world',
+ '(int)1',
+ '(int)2'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DataFormatterOSTypeTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,14 +30,15 @@ class DataFormatterOSTypeTestCase(TestBa
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.mm", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.mm", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -50,4 +52,4 @@ class DataFormatterOSTypeTestCase(TestBa
# Now check that we use the right summary for OSType
self.expect('frame variable',
- substrs = ["'test'","'best'"])
+ substrs=["'test'", "'best'"])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/TestPrintArray.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/TestPrintArray.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/TestPrintArray.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/TestPrintArray.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PrintArrayTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -32,14 +33,15 @@ class PrintArrayTestCase(TestBase):
"""Test that expr -Z works"""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -50,21 +52,85 @@ class PrintArrayTestCase(TestBase):
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
-
- self.expect('expr --element-count 3 -- data', substrs=['[0] = 1', '[1] = 3', '[2] = 5'])
+
+ self.expect(
+ 'expr --element-count 3 -- data',
+ substrs=[
+ '[0] = 1',
+ '[1] = 3',
+ '[2] = 5'])
self.expect('expr data', substrs=['int *', '$', '0x'])
- self.expect('expr -f binary --element-count 0 -- data', substrs=['int *', '$', '0b'])
- self.expect('expr -f hex --element-count 3 -- data', substrs=['[0] = 0x', '1', '[1] = 0x', '3', '[2] = 0x', '5'])
- self.expect('expr -f binary --element-count 2 -- data', substrs=['int *', '$', '0x', '[0] = 0b', '1', '[1] = 0b', '11'])
+ self.expect(
+ 'expr -f binary --element-count 0 -- data',
+ substrs=[
+ 'int *',
+ '$',
+ '0b'])
+ self.expect(
+ 'expr -f hex --element-count 3 -- data',
+ substrs=[
+ '[0] = 0x',
+ '1',
+ '[1] = 0x',
+ '3',
+ '[2] = 0x',
+ '5'])
+ self.expect(
+ 'expr -f binary --element-count 2 -- data',
+ substrs=[
+ 'int *',
+ '$',
+ '0x',
+ '[0] = 0b',
+ '1',
+ '[1] = 0b',
+ '11'])
self.expect('parray 3 data', substrs=['[0] = 1', '[1] = 3', '[2] = 5'])
- self.expect('parray `1 + 1 + 1` data', substrs=['[0] = 1', '[1] = 3', '[2] = 5'])
- self.expect('parray `data[1]` data', substrs=['[0] = 1', '[1] = 3', '[2] = 5'])
- self.expect('parray/x 3 data', substrs=['[0] = 0x', '1', '[1] = 0x', '3', '[2] = 0x', '5'])
- self.expect('parray/x `data[1]` data', substrs=['[0] = 0x', '1', '[1] = 0x', '3', '[2] = 0x', '5'])
+ self.expect(
+ 'parray `1 + 1 + 1` data',
+ substrs=[
+ '[0] = 1',
+ '[1] = 3',
+ '[2] = 5'])
+ self.expect(
+ 'parray `data[1]` data',
+ substrs=[
+ '[0] = 1',
+ '[1] = 3',
+ '[2] = 5'])
+ self.expect(
+ 'parray/x 3 data',
+ substrs=[
+ '[0] = 0x',
+ '1',
+ '[1] = 0x',
+ '3',
+ '[2] = 0x',
+ '5'])
+ self.expect(
+ 'parray/x `data[1]` data',
+ substrs=[
+ '[0] = 0x',
+ '1',
+ '[1] = 0x',
+ '3',
+ '[2] = 0x',
+ '5'])
# check error conditions
- self.expect('expr --element-count 10 -- 123', error=True, substrs=['expression cannot be used with --element-count as it does not refer to a pointer'])
- self.expect('expr --element-count 10 -- (void*)123', error=True, substrs=['expression cannot be used with --element-count as it refers to a pointer to void'])
- self.expect('parray data', error=True, substrs=["invalid element count 'data'"])
- self.expect('parray data data', error=True, substrs=["invalid element count 'data'"])
- self.expect('parray', error=True, substrs=['Not enough arguments provided'])
+ self.expect(
+ 'expr --element-count 10 -- 123',
+ error=True,
+ substrs=['expression cannot be used with --element-count as it does not refer to a pointer'])
+ self.expect(
+ 'expr --element-count 10 -- (void*)123',
+ error=True,
+ substrs=['expression cannot be used with --element-count as it refers to a pointer to void'])
+ self.expect('parray data', error=True, substrs=[
+ "invalid element count 'data'"])
+ self.expect(
+ 'parray data data',
+ error=True,
+ substrs=["invalid element count 'data'"])
+ self.expect('parray', error=True, substrs=[
+ 'Not enough arguments provided'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/TestPrintObjectArray.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/TestPrintObjectArray.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/TestPrintObjectArray.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/TestPrintObjectArray.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PrintObjectArrayTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -33,14 +34,15 @@ class PrintObjectArrayTestCase(TestBase)
"""Test that expr -O -Z works"""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.mm", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.mm", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -52,9 +54,59 @@ class PrintObjectArrayTestCase(TestBase)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
- self.expect('expr --element-count 3 --object-description -- objects', substrs=['3735928559', '4276993775', '3203398366', 'Hello', 'World', 'Two =', '1 ='])
- self.expect('poarray 3 objects', substrs=['3735928559', '4276993775', '3203398366', 'Hello', 'World', 'Two =', '1 ='])
- self.expect('expr --element-count 3 --object-description --description-verbosity=full -- objects', substrs=['[0] =', '3735928559', '4276993775', '3203398366', '[1] =', 'Hello', 'World', '[2] =', 'Two =', '1 ='])
- self.expect('parray 3 objects', substrs=['[0] = 0x', '[1] = 0x', '[2] = 0x'])
- self.expect('expr --element-count 3 -d run -- objects', substrs=['3 elements', '2 elements', '2 key/value pairs'])
- self.expect('expr --element-count 3 -d run --ptr-depth=1 -- objects', substrs=['3 elements', '2 elements', '2 key/value pairs', '3735928559', '4276993775', '3203398366', '"Hello"', '"World"'])
+ self.expect(
+ 'expr --element-count 3 --object-description -- objects',
+ substrs=[
+ '3735928559',
+ '4276993775',
+ '3203398366',
+ 'Hello',
+ 'World',
+ 'Two =',
+ '1 ='])
+ self.expect(
+ 'poarray 3 objects',
+ substrs=[
+ '3735928559',
+ '4276993775',
+ '3203398366',
+ 'Hello',
+ 'World',
+ 'Two =',
+ '1 ='])
+ self.expect(
+ 'expr --element-count 3 --object-description --description-verbosity=full -- objects',
+ substrs=[
+ '[0] =',
+ '3735928559',
+ '4276993775',
+ '3203398366',
+ '[1] =',
+ 'Hello',
+ 'World',
+ '[2] =',
+ 'Two =',
+ '1 ='])
+ self.expect(
+ 'parray 3 objects',
+ substrs=[
+ '[0] = 0x',
+ '[1] = 0x',
+ '[2] = 0x'])
+ self.expect(
+ 'expr --element-count 3 -d run -- objects',
+ substrs=[
+ '3 elements',
+ '2 elements',
+ '2 key/value pairs'])
+ self.expect(
+ 'expr --element-count 3 -d run --ptr-depth=1 -- objects',
+ substrs=[
+ '3 elements',
+ '2 elements',
+ '2 key/value pairs',
+ '3735928559',
+ '4276993775',
+ '3203398366',
+ '"Hello"',
+ '"World"'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class PtrRef2TypedefTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -20,20 +21,21 @@ class PtrRef2TypedefTestCase(TestBase):
TestBase.setUp(self)
# Find the line number to break at.
self.line = line_number('main.cpp', '// Set breakpoint here')
-
+
def test_with_run_command(self):
"""Test that a pointer/reference to a typedef is formatted as we want."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -48,10 +50,18 @@ class PtrRef2TypedefTestCase(TestBase):
self.runCmd('type summary add --cascade true -s "IntLRef" "int &"')
self.runCmd('type summary add --cascade true -s "IntRRef" "int &&"')
- self.expect("frame variable x", substrs = ['(Foo *) x = 0x','IntPointer'])
+ self.expect(
+ "frame variable x",
+ substrs=[
+ '(Foo *) x = 0x',
+ 'IntPointer'])
# note: Ubuntu 12.04 x86_64 build with gcc 4.8.2 is getting a
# const after the ref that isn't showing up on FreeBSD. This
# tweak changes the behavior so that the const is not part of
# the match.
- self.expect("frame variable y", substrs = ['(Foo &', ') y = 0x','IntLRef'])
- self.expect("frame variable z", substrs = ['(Foo &&', ') z = 0x','IntRRef'])
+ self.expect(
+ "frame variable y", substrs=[
+ '(Foo &', ') y = 0x', 'IntLRef'])
+ self.expect(
+ "frame variable z", substrs=[
+ '(Foo &&', ') z = 0x', 'IntRRef'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/TestPyObjSynthProvider.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PyObjectSynthProviderTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -33,14 +34,15 @@ class PyObjectSynthProviderTestCase(Test
"""Test that the PythonObjectSyntheticChildProvider helper class works"""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -51,9 +53,20 @@ class PyObjectSynthProviderTestCase(Test
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
-
+
self.runCmd('command script import provider.py')
- self.runCmd('type synthetic add Foo --python-class provider.SyntheticChildrenProvider')
+ self.runCmd(
+ 'type synthetic add Foo --python-class provider.SyntheticChildrenProvider')
self.expect('frame variable f.Name', substrs=['"Enrico"'])
- self.expect('frame variable f', substrs=['ID = 123456', 'Name = "Enrico"', 'Rate = 1.25'])
- self.expect('expression f', substrs=['ID = 123456', 'Name = "Enrico"', 'Rate = 1.25'])
+ self.expect(
+ 'frame variable f',
+ substrs=[
+ 'ID = 123456',
+ 'Name = "Enrico"',
+ 'Rate = 1.25'])
+ self.expect(
+ 'expression f',
+ substrs=[
+ 'ID = 123456',
+ 'Name = "Enrico"',
+ 'Rate = 1.25'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/provider.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/provider.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/provider.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/provider.py Tue Sep 6 15:57:50 2016
@@ -2,12 +2,15 @@ import lldb
import lldb.formatters
import lldb.formatters.synth
-class SyntheticChildrenProvider(lldb.formatters.synth.PythonObjectSyntheticChildProvider):
+
+class SyntheticChildrenProvider(
+ lldb.formatters.synth.PythonObjectSyntheticChildProvider):
+
def __init__(self, value, internal_dict):
- lldb.formatters.synth.PythonObjectSyntheticChildProvider.__init__(self, value, internal_dict)
+ lldb.formatters.synth.PythonObjectSyntheticChildProvider.__init__(
+ self, value, internal_dict)
def make_children(self):
- return [("ID", 123456),
- ("Name", "Enrico"),
- ("Rate", 1.25)]
-
+ return [("ID", 123456),
+ ("Name", "Enrico"),
+ ("Rate", 1.25)]
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test that ValueObjectPrinter does not ca
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class DataFormatterRefPtrRecursionTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,16 +27,17 @@ class DataFormatterRefPtrRecursionTestCa
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
- self.expect("frame variable foo", substrs = []);
- self.expect("frame variable foo --ptr-depth=1", substrs = ['ID = 1']);
- self.expect("frame variable foo --ptr-depth=2", substrs = ['ID = 1']);
- self.expect("frame variable foo --ptr-depth=3", substrs = ['ID = 1']);
+ self.expect("frame variable foo", substrs=[])
+ self.expect("frame variable foo --ptr-depth=1", substrs=['ID = 1'])
+ self.expect("frame variable foo --ptr-depth=2", substrs=['ID = 1'])
+ self.expect("frame variable foo --ptr-depth=3", substrs=['ID = 1'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py Tue Sep 6 15:57:50 2016
@@ -1,4 +1,6 @@
from lldbsuite.test import lldbinline
from lldbsuite.test import decorators
-lldbinline.MakeInlineTest(__file__, globals(), [decorators.skipIfFreeBSD,decorators.skipIfLinux,decorators.skipIfWindows])
+lldbinline.MakeInlineTest(
+ __file__, globals(), [
+ decorators.skipIfFreeBSD, decorators.skipIfLinux, decorators.skipIfWindows])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py Tue Sep 6 15:57:50 2016
@@ -1,4 +1,7 @@
from lldbsuite.test import lldbinline
from lldbsuite.test import decorators
-lldbinline.MakeInlineTest(__file__, globals(), [decorators.expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24772")])
+lldbinline.MakeInlineTest(
+ __file__, globals(), [
+ decorators.expectedFailureAll(
+ oslist=["windows"], bugnumber="llvm.org/pr24772")])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class Radar9974002DataFormatterTestCase(TestBase):
# test for rdar://problem/9974002 ()
@@ -26,18 +27,20 @@ class Radar9974002DataFormatterTestCase(
"""Test that that file and class static variables display correctly."""
self.build()
if "clang" in self.getCompiler() and "3.4" in self.getCompilerVersion():
- self.skipTest("llvm.org/pr16214 -- clang emits partial DWARF for structures referenced via typedef")
+ self.skipTest(
+ "llvm.org/pr16214 -- clang emits partial DWARF for structures referenced via typedef")
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -47,87 +50,98 @@ class Radar9974002DataFormatterTestCase(
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer.first}\" container")
-
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer.first}\" container")
+
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '<parent is NULL>'])
+ substrs=['mine = ',
+ '1', '<parent is NULL>'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '0x000000'])
+ substrs=['mine = ',
+ '1', '0x000000'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer%S}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer%S}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '0x000000'])
+ substrs=['mine = ',
+ '1', '0x000000'])
self.runCmd("type summary add -s foo contained")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', 'foo'])
+ substrs=['mine = ',
+ '1', 'foo'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', 'foo'])
+ substrs=['mine = ',
+ '1', 'foo'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer%V}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer%V}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '0x000000'])
+ substrs=['mine = ',
+ '1', '0x000000'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer.first}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer.first}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '<parent is NULL>'])
+ substrs=['mine = ',
+ '1', '<parent is NULL>'])
self.runCmd("type summary delete contained")
self.runCmd("n")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '<parent is NULL>'])
+ substrs=['mine = ',
+ '1', '<parent is NULL>'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '0x000000'])
+ substrs=['mine = ',
+ '1', '0x000000'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer%S}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer%S}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '0x000000'])
+ substrs=['mine = ',
+ '1', '0x000000'])
self.runCmd("type summary add -s foo contained")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', 'foo'])
+ substrs=['mine = ',
+ '1', 'foo'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', 'foo'])
+ substrs=['mine = ',
+ '1', 'foo'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer%V}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer%V}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '0x000000'])
+ substrs=['mine = ',
+ '1', '0x000000'])
- self.runCmd("type summary add -s \"${var.scalar} and ${var.pointer.first}\" container")
+ self.runCmd(
+ "type summary add -s \"${var.scalar} and ${var.pointer.first}\" container")
self.expect('frame variable mine',
- substrs = ['mine = ',
- '1', '<parent is NULL>'])
+ substrs=['mine = ',
+ '1', '<parent is NULL>'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Check for an issue where capping does no
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class SyntheticCappingTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -27,7 +28,8 @@ class SyntheticCappingTestCase(TestBase)
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
@@ -35,8 +37,8 @@ class SyntheticCappingTestCase(TestBase)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -45,7 +47,9 @@ class SyntheticCappingTestCase(TestBase)
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)
+ self.runCmd(
+ "settings set target.max-children-count 256",
+ check=False)
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
@@ -60,25 +64,25 @@ class SyntheticCappingTestCase(TestBase)
else:
fake_a_val = 0x00000100
- # check that the synthetic children work, so we know we are doing the right thing
+ # check that the synthetic children work, so we know we are doing the
+ # right thing
self.expect("frame variable f00_1",
- substrs = ['r = 34',
- 'fake_a = %d' % fake_a_val,
- 'a = 1']);
+ substrs=['r = 34',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 1'])
# check that capping works
self.runCmd("settings set target.max-children-count 2", check=False)
-
+
self.expect("frame variable f00_1",
- substrs = ['...',
- 'fake_a = %d' % fake_a_val,
- 'a = 1']);
-
+ substrs=['...',
+ 'fake_a = %d' % fake_a_val,
+ 'a = 1'])
+
self.expect("frame variable f00_1", matching=False,
- substrs = ['r = 34']);
+ substrs=['r = 34'])
-
self.runCmd("settings set target.max-children-count 256", check=False)
self.expect("frame variable f00_1", matching=True,
- substrs = ['r = 34']);
+ substrs=['r = 34'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py Tue Sep 6 15:57:50 2016
@@ -1,21 +1,27 @@
import lldb
+
+
class fooSynthProvider:
+
def __init__(self, valobj, dict):
- self.valobj = valobj;
+ self.valobj = valobj
self.int_type = valobj.GetType().GetBasicType(lldb.eBasicTypeInt)
+
def num_children(self):
- return 3;
+ return 3
+
def get_child_at_index(self, index):
if index == 0:
- child = self.valobj.GetChildMemberWithName('a');
+ child = self.valobj.GetChildMemberWithName('a')
if index == 1:
- child = self.valobj.CreateChildAtOffset ('fake_a', 1, self.int_type);
+ child = self.valobj.CreateChildAtOffset('fake_a', 1, self.int_type)
if index == 2:
- child = self.valobj.GetChildMemberWithName('r');
- return child;
+ child = self.valobj.GetChildMemberWithName('r')
+ return child
+
def get_child_index(self, name):
if name == 'a':
- return 0;
+ return 0
if name == 'fake_a':
- return 1;
- return 2;
+ return 1
+ return 2
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
import datetime
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class SyntheticFilterRecomputingTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,14 +30,15 @@ class SyntheticFilterRecomputingTestCase
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.m", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -49,27 +51,37 @@ class SyntheticFilterRecomputingTestCase
self.addTearDownHook(cleanup)
# Now run the bulk of the test
- id_x = self.dbg.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame().FindVariable("x")
+ id_x = self.dbg.GetSelectedTarget().GetProcess(
+ ).GetSelectedThread().GetSelectedFrame().FindVariable("x")
id_x.SetPreferDynamicValue(lldb.eDynamicCanRunTarget)
id_x.SetPreferSyntheticValue(True)
-
+
if self.TraceOn():
self.runCmd("expr --dynamic-type run-target --ptr-depth 1 -- x")
- self.assertTrue(id_x.GetSummary() == '@"5 elements"', "array does not get correct summary")
+ self.assertTrue(
+ id_x.GetSummary() == '@"5 elements"',
+ "array does not get correct summary")
self.runCmd("next")
self.runCmd("frame select 0")
- id_x = self.dbg.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame().FindVariable("x")
+ id_x = self.dbg.GetSelectedTarget().GetProcess(
+ ).GetSelectedThread().GetSelectedFrame().FindVariable("x")
id_x.SetPreferDynamicValue(lldb.eDynamicCanRunTarget)
id_x.SetPreferSyntheticValue(True)
if self.TraceOn():
self.runCmd("expr --dynamic-type run-target --ptr-depth 1 -- x")
- self.assertTrue(id_x.GetNumChildren() == 7, "dictionary does not have 7 children")
+ self.assertTrue(
+ id_x.GetNumChildren() == 7,
+ "dictionary does not have 7 children")
id_x.SetPreferSyntheticValue(False)
- self.assertFalse(id_x.GetNumChildren() == 7, "dictionary still looks synthetic")
+ self.assertFalse(
+ id_x.GetNumChildren() == 7,
+ "dictionary still looks synthetic")
id_x.SetPreferSyntheticValue(True)
- self.assertTrue(id_x.GetSummary() == "7 key/value pairs", "dictionary does not get correct summary")
+ self.assertTrue(
+ id_x.GetSummary() == "7 key/value pairs",
+ "dictionary does not get correct summary")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_arg/TestTypeSummaryListArg.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TypeSummaryListArgumentTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,9 +24,28 @@ class TypeSummaryListArgumentTestCase(Te
@no_debug_info_test
def test_type_summary_list_with_arg(self):
"""Test that the 'type summary list' command handles command line arguments properly"""
- self.expect('type summary list Foo', substrs=['Category: default', 'Category: system'])
- self.expect('type summary list char', substrs=['char *', 'unsigned char'])
-
- self.expect('type summary list -w default', substrs=['system'], matching=False)
- self.expect('type summary list -w system unsigned', substrs=['default', '0-9'], matching=False)
- self.expect('type summary list -w system char', substrs=['unsigned char *'], matching=True)
+ self.expect(
+ 'type summary list Foo',
+ substrs=[
+ 'Category: default',
+ 'Category: system'])
+ self.expect(
+ 'type summary list char',
+ substrs=[
+ 'char *',
+ 'unsigned char'])
+
+ self.expect(
+ 'type summary list -w default',
+ substrs=['system'],
+ matching=False)
+ self.expect(
+ 'type summary list -w system unsigned',
+ substrs=[
+ 'default',
+ '0-9'],
+ matching=False)
+ self.expect(
+ 'type summary list -w system char',
+ substrs=['unsigned char *'],
+ matching=True)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/TestTypeSummaryListScript.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TypeSummaryListScriptTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -31,14 +32,15 @@ class TypeSummaryListScriptTestCase(Test
"""Test printing out Python summary formatters."""
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -53,9 +55,11 @@ class TypeSummaryListScriptTestCase(Test
self.runCmd("command script import tslsformatters.py")
- self.expect("frame variable myStruct", substrs=['A data formatter at work'])
-
- self.expect('type summary list', substrs=['Struct_SummaryFormatter'])
- self.expect('type summary list Struct', substrs=['Struct_SummaryFormatter'])
-
+ self.expect(
+ "frame variable myStruct",
+ substrs=['A data formatter at work'])
+ self.expect('type summary list', substrs=['Struct_SummaryFormatter'])
+ self.expect(
+ 'type summary list Struct',
+ substrs=['Struct_SummaryFormatter'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/tslsformatters.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/tslsformatters.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/tslsformatters.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/tslsformatters.py Tue Sep 6 15:57:50 2016
@@ -1,10 +1,12 @@
import lldb
+
def Struct_SummaryFormatter(valobj, internal_dict):
return 'A data formatter at work'
category = lldb.debugger.CreateCategory("TSLSFormatters")
category.SetEnabled(True)
-summary = lldb.SBTypeSummary.CreateWithFunctionName("tslsformatters.Struct_SummaryFormatter", lldb.eTypeOptionCascade)
+summary = lldb.SBTypeSummary.CreateWithFunctionName(
+ "tslsformatters.Struct_SummaryFormatter", lldb.eTypeOptionCascade)
spec = lldb.SBTypeNameSpecifier("Struct", False)
category.AddTypeSummary(spec, summary)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py Tue Sep 6 15:57:50 2016
@@ -1,4 +1,7 @@
from lldbsuite.test import lldbinline
from lldbsuite.test import decorators
-lldbinline.MakeInlineTest(__file__, globals(), [decorators.expectedFailureAll(compiler="gcc")])
+lldbinline.MakeInlineTest(
+ __file__, globals(), [
+ decorators.expectedFailureAll(
+ compiler="gcc")])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test that the user can input a format bu
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class UserFormatVSSummaryTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,16 +27,18 @@ class UserFormatVSSummaryTestCase(TestBa
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
- self.expect("frame variable p1", substrs = ['(Pair) p1 = (x = 3, y = -3)']);
+ self.expect("frame variable p1", substrs=[
+ '(Pair) p1 = (x = 3, y = -3)'])
# This is the function to remove the custom formats in order to have a
# clean slate for the next test case.
@@ -48,12 +51,24 @@ class UserFormatVSSummaryTestCase(TestBa
self.runCmd('type summary add Pair -s "x=${var.x%d},y=${var.y%u}"')
- self.expect("frame variable p1", substrs = ['(Pair) p1 = x=3,y=4294967293']);
- self.expect("frame variable -f x p1", substrs = ['(Pair) p1 = x=0x00000003,y=0xfffffffd'], matching=False);
- self.expect("frame variable -f d p1", substrs = ['(Pair) p1 = x=3,y=-3'], matching=False);
- self.expect("frame variable p1", substrs = ['(Pair) p1 = x=3,y=4294967293']);
+ self.expect("frame variable p1", substrs=[
+ '(Pair) p1 = x=3,y=4294967293'])
+ self.expect(
+ "frame variable -f x p1",
+ substrs=['(Pair) p1 = x=0x00000003,y=0xfffffffd'],
+ matching=False)
+ self.expect(
+ "frame variable -f d p1",
+ substrs=['(Pair) p1 = x=3,y=-3'],
+ matching=False)
+ self.expect("frame variable p1", substrs=[
+ '(Pair) p1 = x=3,y=4294967293'])
self.runCmd('type summary add Pair -s "x=${var.x%x},y=${var.y%u}"')
- self.expect("frame variable p1", substrs = ['(Pair) p1 = x=0x00000003,y=4294967293']);
- self.expect("frame variable -f d p1", substrs = ['(Pair) p1 = x=3,y=-3'],matching=False);
+ self.expect("frame variable p1", substrs=[
+ '(Pair) p1 = x=0x00000003,y=4294967293'])
+ self.expect(
+ "frame variable -f d p1",
+ substrs=['(Pair) p1 = x=3,y=-3'],
+ matching=False)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py Tue Sep 6 15:57:50 2016
@@ -5,12 +5,13 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class VarInAggregateMisuseTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -26,14 +27,15 @@ class VarInAggregateMisuseTestCase(TestB
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -43,32 +45,36 @@ class VarInAggregateMisuseTestCase(TestB
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
- self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS ${var}\" Summarize")
-
+ self.runCmd(
+ "type summary add --summary-string \"SUMMARY SUCCESS ${var}\" Summarize")
+
self.expect('frame variable mine_ptr',
- substrs = ['SUMMARY SUCCESS summarize_ptr_t @ '])
+ substrs=['SUMMARY SUCCESS summarize_ptr_t @ '])
self.expect('frame variable *mine_ptr',
- substrs = ['SUMMARY SUCCESS summarize_t @'])
+ substrs=['SUMMARY SUCCESS summarize_t @'])
- self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS ${var.first}\" Summarize")
+ self.runCmd(
+ "type summary add --summary-string \"SUMMARY SUCCESS ${var.first}\" Summarize")
self.expect('frame variable mine_ptr',
- substrs = ['SUMMARY SUCCESS 10'])
+ substrs=['SUMMARY SUCCESS 10'])
self.expect('frame variable *mine_ptr',
- substrs = ['SUMMARY SUCCESS 10'])
+ substrs=['SUMMARY SUCCESS 10'])
self.runCmd("type summary add --summary-string \"${var}\" Summarize")
- self.runCmd("type summary add --summary-string \"${var}\" -e TwoSummarizes")
-
+ self.runCmd(
+ "type summary add --summary-string \"${var}\" -e TwoSummarizes")
+
self.expect('frame variable',
- substrs = ['(TwoSummarizes) twos = TwoSummarizes @ ',
- 'first = summarize_t @ ',
- 'second = summarize_t @ '])
-
- self.runCmd("type summary add --summary-string \"SUMMARY SUCCESS ${var.first}\" Summarize")
+ substrs=['(TwoSummarizes) twos = TwoSummarizes @ ',
+ 'first = summarize_t @ ',
+ 'second = summarize_t @ '])
+
+ self.runCmd(
+ "type summary add --summary-string \"SUMMARY SUCCESS ${var.first}\" Summarize")
self.expect('frame variable',
- substrs = ['(TwoSummarizes) twos = TwoSummarizes @ ',
- 'first = SUMMARY SUCCESS 1',
- 'second = SUMMARY SUCCESS 3'])
+ substrs=['(TwoSummarizes) twos = TwoSummarizes @ ',
+ 'first = SUMMARY SUCCESS 1',
+ 'second = SUMMARY SUCCESS 3'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test lldb data formatter subsystem.
from __future__ import print_function
-
-import os, time
+import os
+import time
import os.path
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PythonSynthDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,20 +24,21 @@ class PythonSynthDataFormatterTestCase(T
# Find the line number to break at.
self.line = line_number('main.cpp', ' // Set breakpoint here.')
- @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
+ @skipIfFreeBSD # llvm.org/pr20545 bogus output confuses buildbot parser
def test_with_run_command(self):
"""Test using Python synthetic children provider."""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -48,10 +50,11 @@ class PythonSynthDataFormatterTestCase(T
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
-
+
self.runCmd("command script import helperfunc.py")
- self.runCmd('type summary add -x "^something<.*>$" -s "T is a ${script.var:helperfunc.f}"')
+ self.runCmd(
+ 'type summary add -x "^something<.*>$" -s "T is a ${script.var:helperfunc.f}"')
+
+ self.expect("frame variable x", substrs=['T is a non-pointer type'])
- self.expect("frame variable x", substrs = ['T is a non-pointer type']);
-
- self.expect("frame variable y", substrs = ['T is a pointer type']);
+ self.expect("frame variable y", substrs=['T is a pointer type'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py Tue Sep 6 15:57:50 2016
@@ -1,5 +1,6 @@
import lldb
-def f(value,d):
- return "pointer type" if value.GetType().GetTemplateArgumentType(0).IsPointerType() else "non-pointer type"
+def f(value, d):
+ return "pointer type" if value.GetType().GetTemplateArgumentType(
+ 0).IsPointerType() else "non-pointer type"
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Check that vector types format properly
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class VectorTypesFormattingTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,20 +24,21 @@ class VectorTypesFormattingTestCase(Test
self.line = line_number('main.cpp', '// break here')
# rdar://problem/14035604
- @skipIf(compiler='gcc') # gcc don't have ext_vector_type extension
+ @skipIf(compiler='gcc') # gcc don't have ext_vector_type extension
def test_with_run_command(self):
"""Check that vector types format properly"""
self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = 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.
@@ -46,29 +48,43 @@ class VectorTypesFormattingTestCase(Test
# Execute the cleanup function during test case tear down.
self.addTearDownHook(cleanup)
- pass # my code never fails
-
+ pass # my code never fails
+
v = self.frame().FindVariable("v")
v.SetPreferSyntheticValue(True)
v.SetFormat(lldb.eFormatVectorOfFloat32)
-
- if self.TraceOn(): print(v)
-
- self.assertTrue(v.GetNumChildren() == 4, "v as float32[] has 4 children")
- self.assertTrue(v.GetChildAtIndex(0).GetData().float[0] == 1.25, "child 0 == 1.25")
- self.assertTrue(v.GetChildAtIndex(1).GetData().float[0] == 1.25, "child 1 == 1.25")
- self.assertTrue(v.GetChildAtIndex(2).GetData().float[0] == 2.50, "child 2 == 2.50")
- self.assertTrue(v.GetChildAtIndex(3).GetData().float[0] == 2.50, "child 3 == 2.50")
-
- self.expect("expr -f int16_t[] -- v", substrs=['(0, 16288, 0, 16288, 0, 16416, 0, 16416)'])
- self.expect("expr -f uint128_t[] -- v", substrs=['(85236745249553456609335044694184296448)'])
- self.expect("expr -f float32[] -- v", substrs=['(1.25, 1.25, 2.5, 2.5)'])
-
+
+ if self.TraceOn():
+ print(v)
+
+ self.assertTrue(
+ v.GetNumChildren() == 4,
+ "v as float32[] has 4 children")
+ self.assertTrue(v.GetChildAtIndex(0).GetData().float[
+ 0] == 1.25, "child 0 == 1.25")
+ self.assertTrue(v.GetChildAtIndex(1).GetData().float[
+ 0] == 1.25, "child 1 == 1.25")
+ self.assertTrue(v.GetChildAtIndex(2).GetData().float[
+ 0] == 2.50, "child 2 == 2.50")
+ self.assertTrue(v.GetChildAtIndex(3).GetData().float[
+ 0] == 2.50, "child 3 == 2.50")
+
+ self.expect("expr -f int16_t[] -- v",
+ substrs=['(0, 16288, 0, 16288, 0, 16416, 0, 16416)'])
+ self.expect("expr -f uint128_t[] -- v",
+ substrs=['(85236745249553456609335044694184296448)'])
+ self.expect(
+ "expr -f float32[] -- v",
+ substrs=['(1.25, 1.25, 2.5, 2.5)'])
+
oldValue = v.GetChildAtIndex(0).GetValue()
v.SetFormat(lldb.eFormatHex)
newValue = v.GetChildAtIndex(0).GetValue()
- self.assertFalse(oldValue == newValue, "values did not change along with format")
-
+ self.assertFalse(oldValue == newValue,
+ "values did not change along with format")
+
v.SetFormat(lldb.eFormatVectorOfFloat32)
oldValueAgain = v.GetChildAtIndex(0).GetValue()
- self.assertTrue(oldValue == oldValueAgain, "same format but different values")
+ self.assertTrue(
+ oldValue == oldValueAgain,
+ "same format but different values")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py Tue Sep 6 15:57:50 2016
@@ -5,21 +5,26 @@ Test that breakpoint works correctly in
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DeadStripTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
@expectedFailureAll(debug_info="dwo", bugnumber="llvm.org/pr25087")
- @expectedFailureAll(oslist=["linux"], debug_info="gmodules", bugnumber="llvm.org/pr27865")
- @skipIfFreeBSD # The -dead_strip linker option isn't supported on FreeBSD versions of ld.
+ @expectedFailureAll(
+ oslist=["linux"],
+ debug_info="gmodules",
+ bugnumber="llvm.org/pr27865")
+ # The -dead_strip linker option isn't supported on FreeBSD versions of ld.
+ @skipIfFreeBSD
def test(self):
"""Test breakpoint works correctly with dead-code stripping."""
self.build()
@@ -27,34 +32,37 @@ class DeadStripTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break by function name f1 (live code).
- lldbutil.run_break_set_by_symbol (self, "f1", num_expected_locations=1, module_name="a.out")
+ lldbutil.run_break_set_by_symbol(
+ self, "f1", num_expected_locations=1, module_name="a.out")
# Break by function name f2 (dead code).
- lldbutil.run_break_set_by_symbol (self, "f2", num_expected_locations=0, module_name="a.out")
+ lldbutil.run_break_set_by_symbol(
+ self, "f2", num_expected_locations=0, module_name="a.out")
# Break by function name f3 (live code).
- lldbutil.run_break_set_by_symbol (self, "f3", num_expected_locations=1, module_name="a.out")
+ lldbutil.run_break_set_by_symbol(
+ self, "f3", num_expected_locations=1, module_name="a.out")
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint (breakpoint #1).
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'a.out`f1',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'a.out`f1',
+ 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f 1", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
self.runCmd("continue")
# The stop reason of the thread should be breakpoint (breakpoint #3).
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'a.out`f3',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'a.out`f3',
+ 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f 3", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py Tue Sep 6 15:57:50 2016
@@ -5,29 +5,37 @@ Test some lldb command abbreviations.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DisassemblyTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=["windows"], bugnumber="function names print fully demangled instead of name-only")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="function names print fully demangled instead of name-only")
def test(self):
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
+ exe = os.path.join(os.getcwd(), "a.out")
self.expect("file " + exe,
- patterns = [ "Current executable set to .*a.out.*" ])
+ patterns=["Current executable set to .*a.out.*"])
- match_object = lldbutil.run_break_set_command (self, "br s -n sum")
- lldbutil.check_breakpoint_result (self, match_object, symbol_name='sum', symbol_match_exact=False, num_locations=1)
+ match_object = lldbutil.run_break_set_command(self, "br s -n sum")
+ lldbutil.check_breakpoint_result(
+ self,
+ match_object,
+ symbol_name='sum',
+ symbol_match_exact=False,
+ num_locations=1)
self.expect("run",
- patterns = [ "Process .* launched: "])
+ patterns=["Process .* launched: "])
self.runCmd("dis -f")
disassembly = self.res.GetOutput()
@@ -40,7 +48,7 @@ class DisassemblyTestCase(TestBase):
elif arch in ["arm", "aarch64"]:
breakpoint_opcodes = ["brk", "udf"]
instructions = [' add ', ' ldr ', ' str ']
- elif re.match("mips" , arch):
+ elif re.match("mips", arch):
breakpoint_opcodes = ["break"]
instructions = ['lw', 'sw']
elif arch in ["s390x"]:
@@ -48,11 +56,17 @@ class DisassemblyTestCase(TestBase):
instructions = [' l ', ' a ', ' st ']
else:
# TODO please add your arch here
- self.fail('unimplemented for arch = "{arch}"'.format(arch=self.getArchitecture()))
+ self.fail(
+ 'unimplemented for arch = "{arch}"'.format(
+ arch=self.getArchitecture()))
# make sure that the software breakpoint has been removed
for op in breakpoint_opcodes:
self.assertFalse(op in disassembly)
# make sure a few reasonable assembly instructions are here
- self.expect(disassembly, exe=False, startstr = "a.out`sum", substrs = instructions)
+ self.expect(
+ disassembly,
+ exe=False,
+ startstr="a.out`sum",
+ substrs=instructions)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py Tue Sep 6 15:57:50 2016
@@ -5,32 +5,33 @@ Test that dynamic values update their ch
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class DynamicValueChildCountTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
def setUp(self):
- # Call super's setUp().
+ # Call super's setUp().
TestBase.setUp(self)
- # Find the line number to break for main.c.
+ # Find the line number to break for main.c.
- self.main_third_call_line = line_number('pass-to-base.cpp',
- '// Break here and check b has 0 children')
- self.main_fourth_call_line = line_number('pass-to-base.cpp',
- '// Break here and check b still has 0 children')
- self.main_fifth_call_line = line_number('pass-to-base.cpp',
- '// Break here and check b has one child now')
- self.main_sixth_call_line = line_number('pass-to-base.cpp',
- '// Break here and check b has 0 children again')
+ self.main_third_call_line = line_number(
+ 'pass-to-base.cpp', '// Break here and check b has 0 children')
+ self.main_fourth_call_line = line_number(
+ 'pass-to-base.cpp', '// Break here and check b still has 0 children')
+ self.main_fifth_call_line = line_number(
+ 'pass-to-base.cpp', '// Break here and check b has one child now')
+ self.main_sixth_call_line = line_number(
+ 'pass-to-base.cpp', '// Break here and check b has 0 children again')
@add_test_categories(['pyapi'])
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24663")
@@ -42,26 +43,31 @@ class DynamicValueChildCountTestCase(Tes
# Create a target from the debugger.
- target = self.dbg.CreateTarget (exe)
+ target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
# Set up our breakpoints:
- third_call_bpt = target.BreakpointCreateByLocation('pass-to-base.cpp', self.main_third_call_line)
+ third_call_bpt = target.BreakpointCreateByLocation(
+ 'pass-to-base.cpp', self.main_third_call_line)
self.assertTrue(third_call_bpt,
VALID_BREAKPOINT)
- fourth_call_bpt = target.BreakpointCreateByLocation('pass-to-base.cpp', self.main_fourth_call_line)
+ fourth_call_bpt = target.BreakpointCreateByLocation(
+ 'pass-to-base.cpp', self.main_fourth_call_line)
self.assertTrue(fourth_call_bpt,
VALID_BREAKPOINT)
- fifth_call_bpt = target.BreakpointCreateByLocation('pass-to-base.cpp', self.main_fifth_call_line)
+ fifth_call_bpt = target.BreakpointCreateByLocation(
+ 'pass-to-base.cpp', self.main_fifth_call_line)
self.assertTrue(fifth_call_bpt,
VALID_BREAKPOINT)
- sixth_call_bpt = target.BreakpointCreateByLocation('pass-to-base.cpp', self.main_sixth_call_line)
+ sixth_call_bpt = target.BreakpointCreateByLocation(
+ 'pass-to-base.cpp', self.main_sixth_call_line)
self.assertTrue(sixth_call_bpt,
VALID_BREAKPOINT)
# Now launch the process, and do not stop at the entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process.GetState() == lldb.eStateStopped,
PROCESS_STOPPED)
@@ -73,4 +79,6 @@ class DynamicValueChildCountTestCase(Tes
self.runCmd("continue")
self.assertTrue(b.GetNumChildren() != 0, "b now has 1 child")
self.runCmd("continue")
- self.assertTrue(b.GetNumChildren() == 0, "b didn't go back to 0 children")
+ self.assertTrue(
+ b.GetNumChildren() == 0,
+ "b didn't go back to 0 children")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py Tue Sep 6 15:57:50 2016
@@ -3,13 +3,13 @@
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class ConvenienceVariablesCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -20,9 +20,11 @@ class ConvenienceVariablesCase(TestBase)
# Find the line number to break on inside main.cpp.
self.line = line_number('main.c', 'Hello world.')
- @skipIfFreeBSD # llvm.org/pr17228
+ @skipIfFreeBSD # llvm.org/pr17228
@skipIfRemote
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
def test_with_run_commands(self):
"""Test convenience variables lldb.debugger, lldb.target, lldb.process, lldb.thread, and lldb.frame."""
self.build()
@@ -32,7 +34,9 @@ class ConvenienceVariablesCase(TestBase)
python_prompt = ">>> "
# So that the child gets torn down after the test.
- self.child = pexpect.spawn('%s %s %s' % (lldbtest_config.lldbExec, self.lldbOption, exe))
+ self.child = pexpect.spawn(
+ '%s %s %s' %
+ (lldbtest_config.lldbExec, self.lldbOption, exe))
child = self.child
# Turn on logging for what the child sends back.
if self.TraceOn():
@@ -56,25 +60,33 @@ class ConvenienceVariablesCase(TestBase)
child.sendline('print(lldb.debugger)')
child.expect_exact(python_prompt)
self.expect(child.before, exe=False,
- patterns = ['Debugger \(instance: .*, id: \d\)'])
+ patterns=['Debugger \(instance: .*, id: \d\)'])
child.sendline('print(lldb.target)')
child.expect_exact(python_prompt)
self.expect(child.before, exe=False,
- substrs = ['a.out'])
+ substrs=['a.out'])
child.sendline('print(lldb.process)')
child.expect_exact(python_prompt)
- self.expect(child.before, exe=False,
- patterns = ['SBProcess: pid = \d+, state = stopped, threads = \d, executable = a.out'])
+ self.expect(child.before, exe=False, patterns=[
+ 'SBProcess: pid = \d+, state = stopped, threads = \d, executable = a.out'])
child.sendline('print(lldb.thread)')
child.expect_exact(python_prompt)
# Linux outputs decimal tid and 'name' instead of 'queue'
- self.expect(child.before, exe=False,
- patterns = ['thread #1: tid = (0x[0-9a-f]+|[0-9]+), 0x[0-9a-f]+ a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ at main\.c:%d, (name|queue) = \'.+\', stop reason = breakpoint 1\.1' % self.line])
+ self.expect(
+ child.before,
+ exe=False,
+ patterns=[
+ 'thread #1: tid = (0x[0-9a-f]+|[0-9]+), 0x[0-9a-f]+ a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ at main\.c:%d, (name|queue) = \'.+\', stop reason = breakpoint 1\.1' %
+ self.line])
child.sendline('print(lldb.frame)')
child.expect_exact(python_prompt)
- self.expect(child.before, exe=False,
- patterns = ['frame #0: 0x[0-9a-f]+ a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ at main\.c:%d' % self.line])
+ self.expect(
+ child.before,
+ exe=False,
+ patterns=[
+ 'frame #0: 0x[0-9a-f]+ a\.out`main\(argc=1, argv=0x[0-9a-f]+\) \+ \d+ at main\.c:%d' %
+ self.line])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py Tue Sep 6 15:57:50 2016
@@ -4,7 +4,6 @@ Test some lldb command abbreviations.
from __future__ import print_function
-
import lldb
import os
import time
@@ -13,14 +12,16 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
-def execute_command (command):
+
+def execute_command(command):
#print('%% %s' % (command))
(exit_status, output) = seven.get_command_status_output(command)
- #if output:
+ # if output:
# print(output)
#print('status = %u' % (exit_status))
return exit_status
+
class ExecTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -28,35 +29,42 @@ class ExecTestCase(TestBase):
@skipUnlessDarwin
def test(self):
if self.getArchitecture() == 'x86_64':
- source = os.path.join (os.getcwd(), "main.cpp")
- o_file = os.path.join (os.getcwd(), "main.o")
- execute_command ("'%s' -g -O0 -arch i386 -arch x86_64 '%s' -c -o '%s'" % (os.environ["CC"], source, o_file))
- execute_command ("'%s' -g -O0 -arch i386 -arch x86_64 '%s'" % (os.environ["CC"], o_file))
+ source = os.path.join(os.getcwd(), "main.cpp")
+ o_file = os.path.join(os.getcwd(), "main.o")
+ execute_command(
+ "'%s' -g -O0 -arch i386 -arch x86_64 '%s' -c -o '%s'" %
+ (os.environ["CC"], source, o_file))
+ execute_command(
+ "'%s' -g -O0 -arch i386 -arch x86_64 '%s'" %
+ (os.environ["CC"], o_file))
if self.debug_info != "dsym":
- dsym_path = os.path.join (os.getcwd(), "a.out.dSYM")
- execute_command ("rm -rf '%s'" % (dsym_path))
+ dsym_path = os.path.join(os.getcwd(), "a.out.dSYM")
+ execute_command("rm -rf '%s'" % (dsym_path))
else:
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
-
+ exe = os.path.join(os.getcwd(), "a.out")
+
# Create the target
target = self.dbg.CreateTarget(exe)
-
+
# Create any breakpoints we need
- breakpoint = target.BreakpointCreateBySourceRegex ('Set breakpoint 1 here', lldb.SBFileSpec ("main.cpp", False))
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ 'Set breakpoint 1 here', lldb.SBFileSpec("main.cpp", False))
self.assertTrue(breakpoint, VALID_BREAKPOINT)
# Launch the process
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
-
+
for i in range(6):
# The stop reason of the thread should be breakpoint.
self.assertTrue(process.GetState() == lldb.eStateStopped,
STOPPED_DUE_TO_BREAKPOINT)
- threads = lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint)
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ process, breakpoint)
self.assertTrue(len(threads) == 1)
# We had a deadlock tearing down the TypeSystemMap on exec, but only if some
@@ -65,21 +73,28 @@ class ExecTestCase(TestBase):
thread = threads[0]
value = thread.frames[0].EvaluateExpression("1 + 2")
- self.assertTrue(value.IsValid(), "Expression evaluated successfully")
+ self.assertTrue(
+ value.IsValid(),
+ "Expression evaluated successfully")
int_value = value.GetValueAsSigned()
self.assertTrue(int_value == 3, "Expression got the right result.")
# Run and we should stop due to exec
process.Continue()
-
+
self.assertTrue(process.GetState() == lldb.eStateStopped,
"Process should be stopped at __dyld_start")
-
- threads = lldbutil.get_stopped_threads(process, lldb.eStopReasonExec)
- self.assertTrue(len(threads) == 1, "We got a thread stopped for exec.")
- # Run and we should stop at breakpoint in main after exec
- process.Continue()
+ threads = lldbutil.get_stopped_threads(
+ process, lldb.eStopReasonExec)
+ self.assertTrue(
+ len(threads) == 1,
+ "We got a thread stopped for exec.")
+
+ # Run and we should stop at breakpoint in main after exec
+ process.Continue()
- threads = lldbutil.get_threads_stopped_at_breakpoint(process, breakpoint)
- self.assertTrue(len(threads) == 1, "Stopped at breakpoint in exec'ed process.")
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ process, breakpoint)
+ self.assertTrue(len(threads) == 1,
+ "Stopped at breakpoint in exec'ed process.")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test that expr will time out and allow o
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class ExprDoesntDeadlockTestCase(TestBase):
def getCategories(self):
@@ -21,7 +22,9 @@ class ExprDoesntDeadlockTestCase(TestBas
mydir = TestBase.compute_mydir(__file__)
@expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr17946')
- @expectedFailureAll(oslist=["windows"], bugnumber="Windows doesn't have pthreads, test needs to be ported")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="Windows doesn't have pthreads, test needs to be ported")
def test_with_run_command(self):
"""Test that expr will time out and allow other threads to run if it blocks."""
self.build()
@@ -31,10 +34,12 @@ class ExprDoesntDeadlockTestCase(TestBas
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
- # Now create a breakpoint at source line before call_me_to_get_lock gets called.
+ # Now create a breakpoint at source line before call_me_to_get_lock
+ # gets called.
- main_file_spec = lldb.SBFileSpec ("locking.c")
- breakpoint = target.BreakpointCreateBySourceRegex('Break here', main_file_spec)
+ main_file_spec = lldb.SBFileSpec("locking.c")
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ 'Break here', main_file_spec)
if self.TraceOn():
print("breakpoint:", breakpoint)
self.assertTrue(breakpoint and
@@ -42,16 +47,19 @@ class ExprDoesntDeadlockTestCase(TestBas
VALID_BREAKPOINT)
# Now launch the process, and do not stop at entry point.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
# Frame #0 should be on self.line1 and the break condition should hold.
from lldbsuite.test.lldbutil import get_stopped_thread
thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
- self.assertTrue(thread.IsValid(), "There should be a thread stopped due to breakpoint condition")
+ self.assertTrue(
+ thread.IsValid(),
+ "There should be a thread stopped due to breakpoint condition")
frame0 = thread.GetFrameAtIndex(0)
- var = frame0.EvaluateExpression ("call_me_to_get_lock()")
- self.assertTrue (var.IsValid())
- self.assertTrue (var.GetValueAsSigned (0) == 567)
+ var = frame0.EvaluateExpression("call_me_to_get_lock()")
+ self.assertTrue(var.IsValid())
+ self.assertTrue(var.GetValueAsSigned(0) == 567)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py Tue Sep 6 15:57:50 2016
@@ -4,7 +4,6 @@ Test some lldb command abbreviations.
from __future__ import print_function
-
import lldb
import os
import time
@@ -13,7 +12,8 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
-def execute_command (command):
+
+def execute_command(command):
# print('%% %s' % (command))
(exit_status, output) = seven.get_command_status_output(command)
# if output:
@@ -21,39 +21,48 @@ def execute_command (command):
# print('status = %u' % (exit_status))
return exit_status
+
class FatArchiveTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipUnlessDarwin
- def test (self):
+ def test(self):
if self.getArchitecture() == 'x86_64':
- execute_command ("make CC='%s'" % (os.environ["CC"]))
- self.main ()
+ execute_command("make CC='%s'" % (os.environ["CC"]))
+ self.main()
else:
- self.skipTest("This test requires x86_64 as the architecture for the inferior")
+ self.skipTest(
+ "This test requires x86_64 as the architecture for the inferior")
- def main (self):
+ def main(self):
'''This test compiles a quick example by making a fat file (universal) full of
skinny .o files and makes sure we can use them to resolve breakpoints when doing
DWARF in .o file debugging. The only thing this test needs to do is to compile and
set a breakpoint in the target and verify any breakpoint locations have valid debug
info for the function, and source file and line.'''
- exe = os.path.join (os.getcwd(), "a.out")
-
+ exe = os.path.join(os.getcwd(), "a.out")
+
# Create the target
target = self.dbg.CreateTarget(exe)
-
+
# Create a breakpoint by name
- breakpoint = target.BreakpointCreateByName ('foo', exe)
+ breakpoint = target.BreakpointCreateByName('foo', exe)
self.assertTrue(breakpoint, VALID_BREAKPOINT)
# Make sure the breakpoint resolves to a function, file and line
for bp_loc in breakpoint:
- # Get a section offset address (lldb.SBAddress) from the breakpoint location
+ # Get a section offset address (lldb.SBAddress) from the breakpoint
+ # location
bp_loc_addr = bp_loc.GetAddress()
line_entry = bp_loc_addr.GetLineEntry()
function = bp_loc_addr.GetFunction()
- self.assertTrue(function.IsValid(), "Verify breakpoint in fat BSD archive has valid function debug info")
- self.assertTrue(line_entry.GetFileSpec(), "Verify breakpoint in fat BSD archive has source file information")
- self.assertTrue(line_entry.GetLine() != 0, "Verify breakpoint in fat BSD archive has source line information")
+ self.assertTrue(
+ function.IsValid(),
+ "Verify breakpoint in fat BSD archive has valid function debug info")
+ self.assertTrue(
+ line_entry.GetFileSpec(),
+ "Verify breakpoint in fat BSD archive has source file information")
+ self.assertTrue(
+ line_entry.GetLine() != 0,
+ "Verify breakpoint in fat BSD archive has source line information")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py Tue Sep 6 15:57:50 2016
@@ -5,24 +5,28 @@ Test the command history mechanism
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestFormats(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+ @expectedFailureAll(
+ hostoslist=["windows"],
+ bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
def test_formats(self):
"""Test format string functionality."""
self.build()
import pexpect
prompt = "(lldb) "
- child = pexpect.spawn('%s %s -x -o "b main" -o r a.out' % (lldbtest_config.lldbExec, self.lldbOption))
+ child = pexpect.spawn(
+ '%s %s -x -o "b main" -o r a.out' %
+ (lldbtest_config.lldbExec, self.lldbOption))
# Turn on logging for what the child sends back.
if self.TraceOn():
child.logfile_read = sys.stdout
@@ -30,13 +34,13 @@ class TestFormats(TestBase):
self.child = child
# Substitute 'Help!' for 'help' using the 'commands regex' mechanism.
- child.expect_exact(prompt + 'target create "a.out"')
- child.expect_exact(prompt + 'b main')
- child.expect_exact(prompt + 'r')
+ child.expect_exact(prompt + 'target create "a.out"')
+ child.expect_exact(prompt + 'b main')
+ child.expect_exact(prompt + 'r')
child.expect_exact(prompt)
child.sendline()
- # child.expect_exact(prompt + "target create")
- #
+ # child.expect_exact(prompt + "target create")
+ #
# child.sendline("command regex 'Help__'")
# child.expect_exact(regex_prompt)
# child.sendline('s/^$/help/')
@@ -51,7 +55,7 @@ class TestFormats(TestBase):
# child.sendline('command unalias Help__')
# child.expect_exact("error: 'Help__' is not an alias, it is a debugger command which can be removed using the 'command delete' command")
# child.expect_exact(prompt)
- #
+ #
# # Delete the regex command using "command delete"
# child.sendline('command delete Help__')
# child.expect_exact(prompt)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/TestArray.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/TestArray.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/TestArray.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/TestArray.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestArray(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,8 @@ class TestArray(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", substrs=["a[10]"])
+ substrs=['stopped'])
+ self.expect(
+ "frame diagnose",
+ "Crash diagnosis was accurate",
+ substrs=["a[10]"])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/TestBadReference.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/TestBadReference.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/TestBadReference.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/TestBadReference.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestBadReference(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,5 @@ class TestBadReference(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", "f->b")
+ substrs=['stopped'])
+ self.expect("frame diagnose", "Crash diagnosis was accurate", "f->b")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/TestComplicatedExpression.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/TestComplicatedExpression.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/TestComplicatedExpression.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/TestComplicatedExpression.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestDiagnoseDereferenceArgument(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,8 @@ class TestDiagnoseDereferenceArgument(Te
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", "f->b->d")
+ substrs=['stopped'])
+ self.expect(
+ "frame diagnose",
+ "Crash diagnosis was accurate",
+ "f->b->d")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestDiagnoseDereferenceArgument(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,8 @@ class TestDiagnoseDereferenceArgument(Te
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", "f->b->d")
+ substrs=['stopped'])
+ self.expect(
+ "frame diagnose",
+ "Crash diagnosis was accurate",
+ "f->b->d")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestDiagnoseDereferenceFunctionReturn(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,6 +22,10 @@ class TestDiagnoseDereferenceFunctionRet
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", substrs = ["GetAFoo", "->b"])
-
+ substrs=['stopped'])
+ self.expect(
+ "frame diagnose",
+ "Crash diagnosis was accurate",
+ substrs=[
+ "GetAFoo",
+ "->b"])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/TestDiagnoseDereferenceThis.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/TestDiagnoseDereferenceThis.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/TestDiagnoseDereferenceThis.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/TestDiagnoseDereferenceThis.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestDiagnoseDereferenceThis(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,8 @@ class TestDiagnoseDereferenceThis(TestBa
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", "this->a")
+ substrs=['stopped'])
+ self.expect(
+ "frame diagnose",
+ "Crash diagnosis was accurate",
+ "this->a")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestDiagnoseInheritance(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,5 @@ class TestDiagnoseInheritance(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", "d")
+ substrs=['stopped'])
+ self.expect("frame diagnose", "Crash diagnosis was accurate", "d")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/TestLocalVariable.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/TestLocalVariable.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/TestLocalVariable.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/TestLocalVariable.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestLocalVariable(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,5 @@ class TestLocalVariable(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", "myInt")
+ substrs=['stopped'])
+ self.expect("frame diagnose", "Crash diagnosis was accurate", "myInt")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py Tue Sep 6 15:57:50 2016
@@ -10,6 +10,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestDiagnoseVirtualMethodCall(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,5 +22,5 @@ class TestDiagnoseVirtualMethodCall(Test
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", "Thread should be stopped",
- substrs = ['stopped'])
- self.expect("frame diagnose", "Crash diagnosis was accurate", "foo")
+ substrs=['stopped'])
+ self.expect("frame diagnose", "Crash diagnosis was accurate", "foo")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py Tue Sep 6 15:57:50 2016
@@ -3,79 +3,117 @@
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test import lldbutil
from lldbsuite.test import lldbplatformutil
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
+
class AssertingInferiorTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
- @expectedFailureAll(oslist=["linux"], archs=["arm"], bugnumber="llvm.org/pr25338")
- @expectedFailureAll(bugnumber="llvm.org/pr26592", triple = '^mips')
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
+ @expectedFailureAll(
+ oslist=["linux"],
+ archs=["arm"],
+ bugnumber="llvm.org/pr25338")
+ @expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
def test_inferior_asserting(self):
"""Test that lldb reliably catches the inferior asserting (command)."""
self.build()
self.inferior_asserting()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
- @expectedFailureAndroid(api_levels=list(range(16 + 1))) # b.android.com/179836
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
+ @expectedFailureAndroid(
+ api_levels=list(
+ range(
+ 16 +
+ 1))) # b.android.com/179836
def test_inferior_asserting_register(self):
"""Test that lldb reliably reads registers from the inferior after asserting (command)."""
self.build()
self.inferior_asserting_registers()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
- @expectedFailureAll(oslist=["linux"], archs=["aarch64", "arm"], bugnumber="llvm.org/pr25338")
- @expectedFailureAll(bugnumber="llvm.org/pr26592", triple = '^mips')
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
+ @expectedFailureAll(
+ oslist=["linux"],
+ archs=[
+ "aarch64",
+ "arm"],
+ bugnumber="llvm.org/pr25338")
+ @expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
def test_inferior_asserting_disassemble(self):
"""Test that lldb reliably disassembles frames after asserting (command)."""
self.build()
self.inferior_asserting_disassemble()
@add_test_categories(['pyapi'])
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
def test_inferior_asserting_python(self):
"""Test that lldb reliably catches the inferior asserting (Python API)."""
self.build()
self.inferior_asserting_python()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
- @expectedFailureAll(oslist=["linux"], archs=["aarch64", "arm"], bugnumber="llvm.org/pr25338")
- @expectedFailureAll(bugnumber="llvm.org/pr26592", triple = '^mips')
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
+ @expectedFailureAll(
+ oslist=["linux"],
+ archs=[
+ "aarch64",
+ "arm"],
+ bugnumber="llvm.org/pr25338")
+ @expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
def test_inferior_asserting_expr(self):
"""Test that the lldb expression interpreter can read from the inferior after asserting (command)."""
self.build()
self.inferior_asserting_expr()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
- @expectedFailureAll(oslist=["linux"], archs=["aarch64", "arm"], bugnumber="llvm.org/pr25338")
- @expectedFailureAll(bugnumber="llvm.org/pr26592", triple = '^mips')
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr21793: need to implement support for detecting assertion / abort on Windows")
+ @expectedFailureAll(
+ oslist=["linux"],
+ archs=[
+ "aarch64",
+ "arm"],
+ bugnumber="llvm.org/pr25338")
+ @expectedFailureAll(bugnumber="llvm.org/pr26592", triple='^mips')
def test_inferior_asserting_step(self):
"""Test that lldb functions correctly after stepping through a call to assert()."""
self.build()
self.inferior_asserting_step()
def set_breakpoint(self, line):
- lldbutil.run_break_set_by_file_and_line (self, "main.c", line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", line, num_expected_locations=1, loc_exact=True)
def check_stop_reason(self):
- matched = lldbplatformutil.match_android_device(self.getArchitecture(), valid_api_levels=list(range(1, 16+1)))
+ matched = lldbplatformutil.match_android_device(
+ self.getArchitecture(), valid_api_levels=list(range(1, 16 + 1)))
if matched:
- # On android until API-16 the abort() call ended in a sigsegv instead of in a sigabrt
+ # On android until API-16 the abort() call ended in a sigsegv
+ # instead of in a sigabrt
stop_reason = 'stop reason = signal SIGSEGV'
else:
stop_reason = 'stop reason = signal SIGABRT'
# The stop reason of the thread should be an abort signal or exception.
self.expect("thread list", STOPPED_DUE_TO_ASSERT,
- substrs = ['stopped',
- stop_reason])
+ substrs=['stopped',
+ stop_reason])
return stop_reason
@@ -95,12 +133,12 @@ class AssertingInferiorTestCase(TestBase
# And it should report a backtrace that includes the assert site.
self.expect("thread backtrace all",
- substrs = [stop_reason, 'main', 'argc', 'argv'])
+ substrs=[stop_reason, 'main', 'argc', 'argv'])
# And it should report the correct line number.
self.expect("thread backtrace all",
- substrs = [stop_reason,
- 'main.c:%d' % self.line])
+ substrs=[stop_reason,
+ 'main.c:%d' % self.line])
def inferior_asserting_python(self):
"""Inferior asserts upon launching; lldb should catch the event and stop."""
@@ -111,7 +149,8 @@ class AssertingInferiorTestCase(TestBase
# Now launch the process, and do not stop at entry point.
# Both argv and envp are null.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
if process.GetState() != lldb.eStateStopped:
self.fail("Process should be in the 'stopped' state, "
@@ -133,7 +172,8 @@ class AssertingInferiorTestCase(TestBase
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- # lldb should be able to read from registers from the inferior after asserting.
+ # lldb should be able to read from registers from the inferior after
+ # asserting.
lldbplatformutil.check_first_register_readable(self)
def inferior_asserting_disassemble(self):
@@ -145,7 +185,7 @@ class AssertingInferiorTestCase(TestBase
self.assertTrue(target, VALID_TARGET)
# Launch the process, and do not stop at the entry point.
- target.LaunchSimple (None, None, self.get_process_working_directory())
+ target.LaunchSimple(None, None, self.get_process_working_directory())
self.check_stop_reason()
process = target.GetProcess()
@@ -154,17 +194,20 @@ class AssertingInferiorTestCase(TestBase
thread = process.GetThreadAtIndex(0)
self.assertTrue(thread.IsValid(), "current thread is valid")
- lastframeID = thread.GetFrameAtIndex(thread.GetNumFrames() - 1).GetFrameID()
+ lastframeID = thread.GetFrameAtIndex(
+ thread.GetNumFrames() - 1).GetFrameID()
isi386Arch = False
if "i386" in self.getArchitecture():
isi386Arch = True
- # lldb should be able to disassemble frames from the inferior after asserting.
+ # lldb should be able to disassemble frames from the inferior after
+ # asserting.
for frame in thread:
self.assertTrue(frame.IsValid(), "current frame is valid")
- self.runCmd("frame select " + str(frame.GetFrameID()), RUN_SUCCEEDED)
+ self.runCmd("frame select " +
+ str(frame.GetFrameID()), RUN_SUCCEEDED)
# Don't expect the function name to be in the disassembly as the assert
# function might be a no-return function where the PC is past the end
@@ -174,11 +217,14 @@ class AssertingInferiorTestCase(TestBase
pc_backup_offset = 1
if frame.GetFrameID() == 0:
pc_backup_offset = 0
- if isi386Arch == True:
+ if isi386Arch:
if lastframeID == frame.GetFrameID():
pc_backup_offset = 0
- self.expect("disassemble -a %s" % (frame.GetPC() - pc_backup_offset),
- substrs = ['<+0>: '])
+ self.expect(
+ "disassemble -a %s" %
+ (frame.GetPC() -
+ pc_backup_offset),
+ substrs=['<+0>: '])
def check_expr_in_main(self, thread):
depth = thread.GetNumFrames()
@@ -186,17 +232,19 @@ class AssertingInferiorTestCase(TestBase
frame = thread.GetFrameAtIndex(i)
self.assertTrue(frame.IsValid(), "current frame is valid")
if self.TraceOn():
- print("Checking if function %s is main" % frame.GetFunctionName())
+ print(
+ "Checking if function %s is main" %
+ frame.GetFunctionName())
if 'main' == frame.GetFunctionName():
frame_id = frame.GetFrameID()
self.runCmd("frame select " + str(frame_id), RUN_SUCCEEDED)
- self.expect("p argc", substrs = ['(int)', ' = 1'])
- self.expect("p hello_world", substrs = ['Hello'])
- self.expect("p argv[0]", substrs = ['a.out'])
- self.expect("p null_ptr", substrs = ['= 0x0'])
- return True
- return False
+ self.expect("p argc", substrs=['(int)', ' = 1'])
+ self.expect("p hello_world", substrs=['Hello'])
+ self.expect("p argv[0]", substrs=['a.out'])
+ self.expect("p null_ptr", substrs=['= 0x0'])
+ return True
+ return False
def inferior_asserting_expr(self):
"""Test that the lldb expression interpreter can read symbols after asserting."""
@@ -207,7 +255,7 @@ class AssertingInferiorTestCase(TestBase
self.assertTrue(target, VALID_TARGET)
# Launch the process, and do not stop at the entry point.
- target.LaunchSimple (None, None, self.get_process_working_directory())
+ target.LaunchSimple(None, None, self.get_process_working_directory())
self.check_stop_reason()
process = target.GetProcess()
@@ -216,8 +264,11 @@ class AssertingInferiorTestCase(TestBase
thread = process.GetThreadAtIndex(0)
self.assertTrue(thread.IsValid(), "current thread is valid")
- # The lldb expression interpreter should be able to read from addresses of the inferior after a call to assert().
- self.assertTrue(self.check_expr_in_main(thread), "cannot find 'main' in the backtrace")
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a call to assert().
+ self.assertTrue(
+ self.check_expr_in_main(thread),
+ "cannot find 'main' in the backtrace")
def inferior_asserting_step(self):
"""Test that lldb functions correctly after stepping through a call to assert()."""
@@ -229,20 +280,21 @@ class AssertingInferiorTestCase(TestBase
# Launch the process, and do not stop at the entry point.
self.set_breakpoint(self.line)
- target.LaunchSimple (None, None, self.get_process_working_directory())
+ target.LaunchSimple(None, None, self.get_process_working_directory())
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['main.c:%d' % self.line,
- 'stop reason = breakpoint'])
+ substrs=['main.c:%d' % self.line,
+ 'stop reason = breakpoint'])
self.runCmd("next")
stop_reason = self.check_stop_reason()
- # lldb should be able to read from registers from the inferior after asserting.
+ # lldb should be able to read from registers from the inferior after
+ # asserting.
if "x86_64" in self.getArchitecture():
- self.expect("register read rbp", substrs = ['rbp = 0x'])
+ self.expect("register read rbp", substrs=['rbp = 0x'])
if "i386" in self.getArchitecture():
- self.expect("register read ebp", substrs = ['ebp = 0x'])
+ self.expect("register read ebp", substrs=['ebp = 0x'])
process = target.GetProcess()
self.assertTrue(process.IsValid(), "current process is valid")
@@ -250,10 +302,13 @@ class AssertingInferiorTestCase(TestBase
thread = process.GetThreadAtIndex(0)
self.assertTrue(thread.IsValid(), "current thread is valid")
- # The lldb expression interpreter should be able to read from addresses of the inferior after a call to assert().
- self.assertTrue(self.check_expr_in_main(thread), "cannot find 'main' in the backtrace")
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a call to assert().
+ self.assertTrue(
+ self.check_expr_in_main(thread),
+ "cannot find 'main' in the backtrace")
# And it should report the correct line number.
self.expect("thread backtrace all",
- substrs = [stop_reason,
- 'main.c:%d' % self.line])
+ substrs=[stop_reason,
+ 'main.c:%d' % self.line])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py Tue Sep 6 15:57:50 2016
@@ -3,14 +3,15 @@
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import configuration
from lldbsuite.test import lldbutil
+
class ChangedInferiorTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -47,12 +48,12 @@ class ChangedInferiorTestCase(TestBase):
# We should have one crashing thread
self.assertEqual(
- len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
- 1,
- STOPPED_DUE_TO_EXC_BAD_ACCESS)
+ len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
+ 1,
+ STOPPED_DUE_TO_EXC_BAD_ACCESS)
# And it should report the correct line number.
- self.expect("thread backtrace all", substrs = ['main.c:%d' % self.line1])
+ self.expect("thread backtrace all", substrs=['main.c:%d' % self.line1])
def inferior_not_crashing(self):
"""Test lldb reloads the inferior after it was changed during the session."""
@@ -61,22 +62,23 @@ class ChangedInferiorTestCase(TestBase):
self.runCmd("process status")
self.assertNotEqual(
- len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
- 1,
- "Inferior changed, but lldb did not perform a reload")
+ len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
+ 1,
+ "Inferior changed, but lldb did not perform a reload")
# Break inside the main.
- lldbutil.run_break_set_by_file_and_line (self, "main2.c", self.line2, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main2.c", self.line2, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
self.runCmd("frame variable int_ptr")
self.expect("frame variable *int_ptr",
- substrs = ['= 7'])
+ substrs=['= 7'])
self.expect("expression *int_ptr",
- substrs = ['= 7'])
+ substrs=['= 7'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py Tue Sep 6 15:57:50 2016
@@ -3,74 +3,94 @@
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test import lldbutil
from lldbsuite.test import lldbplatformutil
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
+
class CrashingInferiorTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr23699 SIGSEGV is reported as exception, not signal")
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
+ @expectedFailureAll(
+ oslist=['freebsd'],
+ bugnumber="llvm.org/pr23699 SIGSEGV is reported as exception, not signal")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
def test_inferior_crashing(self):
"""Test that lldb reliably catches the inferior crashing (command)."""
self.build()
self.inferior_crashing()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
def test_inferior_crashing_register(self):
"""Test that lldb reliably reads registers from the inferior after crashing (command)."""
self.build()
self.inferior_crashing_registers()
@add_test_categories(['pyapi'])
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
def test_inferior_crashing_python(self):
"""Test that lldb reliably catches the inferior crashing (Python API)."""
self.build()
self.inferior_crashing_python()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
def test_inferior_crashing_expr(self):
"""Test that the lldb expression interpreter can read from the inferior after crashing (command)."""
self.build()
self.inferior_crashing_expr()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
def test_inferior_crashing_step(self):
"""Test that stepping after a crash behaves correctly."""
self.build()
self.inferior_crashing_step()
@expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr24939')
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
- @skipIfTargetAndroid() # debuggerd interferes with this test on Android
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
+ @skipIfTargetAndroid() # debuggerd interferes with this test on Android
def test_inferior_crashing_step_after_break(self):
"""Test that lldb functions correctly after stepping through a crash."""
self.build()
self.inferior_crashing_step_after_break()
- @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
- @skipIfLinux # Inferior exits after stepping after a segfault. This is working as intended IMHO.
+ @expectedFailureAll(
+ oslist=["windows"],
+ bugnumber="llvm.org/pr24778, This actually works, but the test relies on the output format instead of the API")
+ # Inferior exits after stepping after a segfault. This is working as
+ # intended IMHO.
+ @skipIfLinux
def test_inferior_crashing_expr_step_and_expr(self):
"""Test that lldb expressions work before and after stepping after a crash."""
self.build()
self.inferior_crashing_expr_step_expr()
def set_breakpoint(self, line):
- lldbutil.run_break_set_by_file_and_line (self, "main.c", line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", line, num_expected_locations=1, loc_exact=True)
def check_stop_reason(self):
# We should have one crashing thread
self.assertEqual(
- len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
- 1,
- STOPPED_DUE_TO_EXC_BAD_ACCESS)
+ len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
+ 1,
+ STOPPED_DUE_TO_EXC_BAD_ACCESS)
def get_api_stop_reason(self):
return lldb.eStopReasonException
@@ -95,13 +115,13 @@ class CrashingInferiorTestCase(TestBase)
else:
stop_reason = 'stop reason = invalid address'
self.expect("thread list", STOPPED_DUE_TO_EXC_BAD_ACCESS,
- substrs = ['stopped',
- stop_reason])
+ substrs=['stopped',
+ stop_reason])
# And it should report the correct line number.
self.expect("thread backtrace all",
- substrs = [stop_reason,
- 'main.c:%d' % self.line])
+ substrs=[stop_reason,
+ 'main.c:%d' % self.line])
def inferior_crashing_python(self):
"""Inferior crashes upon launching; lldb should catch the event and stop."""
@@ -112,7 +132,8 @@ class CrashingInferiorTestCase(TestBase)
# Now launch the process, and do not stop at entry point.
# Both argv and envp are null.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
if process.GetState() != lldb.eStateStopped:
self.fail("Process should be in the 'stopped' state, "
@@ -120,7 +141,10 @@ class CrashingInferiorTestCase(TestBase)
lldbutil.state_type_to_str(process.GetState()))
threads = lldbutil.get_crashed_threads(self, process)
- self.assertEqual(len(threads), 1, "Failed to stop the thread upon bad access exception")
+ self.assertEqual(
+ len(threads),
+ 1,
+ "Failed to stop the thread upon bad access exception")
if self.TraceOn():
lldbutil.print_stacktrace(threads[0])
@@ -133,7 +157,8 @@ class CrashingInferiorTestCase(TestBase)
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- # lldb should be able to read from registers from the inferior after crashing.
+ # lldb should be able to read from registers from the inferior after
+ # crashing.
lldbplatformutil.check_first_register_readable(self)
def inferior_crashing_expr(self):
@@ -144,12 +169,13 @@ class CrashingInferiorTestCase(TestBase)
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- # The lldb expression interpreter should be able to read from addresses of the inferior after a crash.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a crash.
self.expect("p argc",
- startstr = '(int) $0 = 1')
+ startstr='(int) $0 = 1')
self.expect("p hello_world",
- substrs = ['Hello'])
+ substrs=['Hello'])
def inferior_crashing_step(self):
"""Test that lldb functions correctly after stepping through a crash."""
@@ -160,24 +186,26 @@ class CrashingInferiorTestCase(TestBase)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['main.c:%d' % self.line,
- 'stop reason = breakpoint'])
+ substrs=['main.c:%d' % self.line,
+ 'stop reason = breakpoint'])
self.runCmd("next")
self.check_stop_reason()
- # The lldb expression interpreter should be able to read from addresses of the inferior after a crash.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a crash.
self.expect("p argv[0]",
- substrs = ['a.out'])
+ substrs=['a.out'])
self.expect("p null_ptr",
- substrs = ['= 0x0'])
+ substrs=['= 0x0'])
- # lldb should be able to read from registers from the inferior after crashing.
+ # lldb should be able to read from registers from the inferior after
+ # crashing.
lldbplatformutil.check_first_register_readable(self)
# And it should report the correct line number.
self.expect("thread backtrace all",
- substrs = ['main.c:%d' % self.line])
+ substrs=['main.c:%d' % self.line])
def inferior_crashing_step_after_break(self):
"""Test that lldb behaves correctly when stepping after a crash."""
@@ -187,15 +215,20 @@ class CrashingInferiorTestCase(TestBase)
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- expected_state = 'exited' # Provide the exit code.
+ expected_state = 'exited' # Provide the exit code.
if self.platformIsDarwin():
- expected_state = 'stopped' # TODO: Determine why 'next' and 'continue' have no effect after a crash.
+ # TODO: Determine why 'next' and 'continue' have no effect after a
+ # crash.
+ expected_state = 'stopped'
self.expect("next",
- substrs = ['Process', expected_state])
+ substrs=['Process', expected_state])
if expected_state == 'exited':
- self.expect("thread list", error=True,substrs = ['Process must be launched'])
+ self.expect(
+ "thread list",
+ error=True,
+ substrs=['Process must be launched'])
else:
self.check_stop_reason()
@@ -207,13 +240,15 @@ class CrashingInferiorTestCase(TestBase)
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- # The lldb expression interpreter should be able to read from addresses of the inferior after a crash.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a crash.
self.expect("p argv[0]",
- substrs = ['a.out'])
+ substrs=['a.out'])
self.runCmd("next")
self.check_stop_reason()
- # The lldb expression interpreter should be able to read from addresses of the inferior after a crash.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a crash.
self.expect("p argv[0]",
- substrs = ['a.out'])
+ substrs=['a.out'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py Tue Sep 6 15:57:50 2016
@@ -3,19 +3,22 @@
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbplatformutil
from lldbsuite.test import lldbutil
+
class CrashingRecursiveInferiorTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=['freebsd'], bugnumber="llvm.org/pr23699 SIGSEGV is reported as exception, not signal")
+ @expectedFailureAll(
+ oslist=['freebsd'],
+ bugnumber="llvm.org/pr23699 SIGSEGV is reported as exception, not signal")
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
def test_recursive_inferior_crashing(self):
"""Test that lldb reliably catches the inferior crashing (command)."""
@@ -49,13 +52,15 @@ class CrashingRecursiveInferiorTestCase(
@expectedFailureAll(oslist=['freebsd'], bugnumber='llvm.org/pr24939')
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
- @skipIfTargetAndroid() # debuggerd interferes with this test on Android
+ @skipIfTargetAndroid() # debuggerd interferes with this test on Android
def test_recursive_inferior_crashing_step_after_break(self):
"""Test that lldb functions correctly after stepping through a crash."""
self.build()
self.recursive_inferior_crashing_step_after_break()
- @skipIfLinux # Inferior exits after stepping after a segfault. This is working as intended IMHO.
+ # Inferior exits after stepping after a segfault. This is working as
+ # intended IMHO.
+ @skipIfLinux
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
def test_recursive_inferior_crashing_expr_step_and_expr(self):
"""Test that lldb expressions work before and after stepping after a crash."""
@@ -63,14 +68,15 @@ class CrashingRecursiveInferiorTestCase(
self.recursive_inferior_crashing_expr_step_expr()
def set_breakpoint(self, line):
- lldbutil.run_break_set_by_file_and_line (self, "main.c", line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.c", line, num_expected_locations=1, loc_exact=True)
def check_stop_reason(self):
# We should have one crashing thread
self.assertEqual(
- len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
- 1,
- STOPPED_DUE_TO_EXC_BAD_ACCESS)
+ len(lldbutil.get_crashed_threads(self, self.dbg.GetSelectedTarget().GetProcess())),
+ 1,
+ STOPPED_DUE_TO_EXC_BAD_ACCESS)
def setUp(self):
# Call super's setUp().
@@ -93,17 +99,24 @@ class CrashingRecursiveInferiorTestCase(
else:
stop_reason = 'stop reason = invalid address'
self.expect("thread list", STOPPED_DUE_TO_EXC_BAD_ACCESS,
- substrs = ['stopped',
- stop_reason])
+ substrs=['stopped',
+ stop_reason])
- # And it should report a backtrace that includes main and the crash site.
- self.expect("thread backtrace all",
- substrs = [stop_reason, 'main', 'argc', 'argv', 'recursive_function'])
+ # And it should report a backtrace that includes main and the crash
+ # site.
+ self.expect(
+ "thread backtrace all",
+ substrs=[
+ stop_reason,
+ 'main',
+ 'argc',
+ 'argv',
+ 'recursive_function'])
# And it should report the correct line number.
self.expect("thread backtrace all",
- substrs = [stop_reason,
- 'main.c:%d' % self.line])
+ substrs=[stop_reason,
+ 'main.c:%d' % self.line])
def recursive_inferior_crashing_python(self):
"""Inferior crashes upon launching; lldb should catch the event and stop."""
@@ -114,7 +127,8 @@ class CrashingRecursiveInferiorTestCase(
# Now launch the process, and do not stop at entry point.
# Both argv and envp are null.
- process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
if process.GetState() != lldb.eStateStopped:
self.fail("Process should be in the 'stopped' state, "
@@ -122,7 +136,10 @@ class CrashingRecursiveInferiorTestCase(
lldbutil.state_type_to_str(process.GetState()))
threads = lldbutil.get_crashed_threads(self, process)
- self.assertEqual(len(threads), 1, "Failed to stop the thread upon bad access exception")
+ self.assertEqual(
+ len(threads),
+ 1,
+ "Failed to stop the thread upon bad access exception")
if self.TraceOn():
lldbutil.print_stacktrace(threads[0])
@@ -135,7 +152,8 @@ class CrashingRecursiveInferiorTestCase(
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- # lldb should be able to read from registers from the inferior after crashing.
+ # lldb should be able to read from registers from the inferior after
+ # crashing.
lldbplatformutil.check_first_register_readable(self)
def recursive_inferior_crashing_expr(self):
@@ -146,9 +164,10 @@ class CrashingRecursiveInferiorTestCase(
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- # The lldb expression interpreter should be able to read from addresses of the inferior after a crash.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a crash.
self.expect("p i",
- startstr = '(int) $0 =')
+ startstr='(int) $0 =')
def recursive_inferior_crashing_step(self):
"""Test that lldb functions correctly after stepping through a crash."""
@@ -159,22 +178,24 @@ class CrashingRecursiveInferiorTestCase(
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['main.c:%d' % self.line,
- 'stop reason = breakpoint'])
+ substrs=['main.c:%d' % self.line,
+ 'stop reason = breakpoint'])
self.runCmd("next")
self.check_stop_reason()
- # The lldb expression interpreter should be able to read from addresses of the inferior after a crash.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a crash.
self.expect("p i",
- substrs = ['(int) $0 ='])
+ substrs=['(int) $0 ='])
- # lldb should be able to read from registers from the inferior after crashing.
+ # lldb should be able to read from registers from the inferior after
+ # crashing.
lldbplatformutil.check_first_register_readable(self)
# And it should report the correct line number.
self.expect("thread backtrace all",
- substrs = ['main.c:%d' % self.line])
+ substrs=['main.c:%d' % self.line])
def recursive_inferior_crashing_step_after_break(self):
"""Test that lldb behaves correctly when stepping after a crash."""
@@ -184,15 +205,20 @@ class CrashingRecursiveInferiorTestCase(
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- expected_state = 'exited' # Provide the exit code.
+ expected_state = 'exited' # Provide the exit code.
if self.platformIsDarwin():
- expected_state = 'stopped' # TODO: Determine why 'next' and 'continue' have no effect after a crash.
+ # TODO: Determine why 'next' and 'continue' have no effect after a
+ # crash.
+ expected_state = 'stopped'
self.expect("next",
- substrs = ['Process', expected_state])
+ substrs=['Process', expected_state])
if expected_state == 'exited':
- self.expect("thread list", error=True,substrs = ['Process must be launched'])
+ self.expect(
+ "thread list",
+ error=True,
+ substrs=['Process must be launched'])
else:
self.check_stop_reason()
@@ -204,14 +230,16 @@ class CrashingRecursiveInferiorTestCase(
self.runCmd("run", RUN_SUCCEEDED)
self.check_stop_reason()
- # The lldb expression interpreter should be able to read from addresses of the inferior after a crash.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a crash.
self.expect("p null",
- startstr = '(char *) $0 = 0x0')
+ startstr='(char *) $0 = 0x0')
self.runCmd("next")
- # The lldb expression interpreter should be able to read from addresses of the inferior after a step.
+ # The lldb expression interpreter should be able to read from addresses
+ # of the inferior after a step.
self.expect("p null",
- startstr = '(char *) $1 = 0x0')
+ startstr='(char *) $1 = 0x0')
self.check_stop_reason()
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py Tue Sep 6 15:57:50 2016
@@ -3,19 +3,23 @@
from __future__ import print_function
-
-import os, time, sys
+import os
+import time
+import sys
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestInlineStepping(TestBase):
mydir = TestBase.compute_mydir(__file__)
@add_test_categories(['pyapi'])
- @expectedFailureAll(compiler="icc", bugnumber="# Not really a bug. ICC combines two inlined functions.")
+ @expectedFailureAll(
+ compiler="icc",
+ bugnumber="# Not really a bug. ICC combines two inlined functions.")
def test_with_python_api(self):
"""Test stepping over and into inlined functions."""
self.build()
@@ -26,7 +30,7 @@ class TestInlineStepping(TestBase):
"""Test stepping over and into inlined functions."""
self.build()
self.inline_stepping_step_over()
-
+
@add_test_categories(['pyapi'])
def test_step_in_template_with_python_api(self):
"""Test stepping in to templated functions."""
@@ -39,10 +43,21 @@ class TestInlineStepping(TestBase):
# Find the line numbers that we will step to in main:
self.main_source = "calling.cpp"
self.source_lines = {}
- functions = ['caller_ref_1', 'caller_ref_2', 'inline_ref_1', 'inline_ref_2', 'called_by_inline_ref', 'caller_trivial_1', 'caller_trivial_2', 'inline_trivial_1', 'inline_trivial_2', 'called_by_inline_trivial' ]
+ functions = [
+ 'caller_ref_1',
+ 'caller_ref_2',
+ 'inline_ref_1',
+ 'inline_ref_2',
+ 'called_by_inline_ref',
+ 'caller_trivial_1',
+ 'caller_trivial_2',
+ 'inline_trivial_1',
+ 'inline_trivial_2',
+ 'called_by_inline_trivial']
for name in functions:
- self.source_lines[name] = line_number(self.main_source, "// In " + name + ".")
- self.main_source_spec = lldb.SBFileSpec (self.main_source)
+ self.source_lines[name] = line_number(
+ self.main_source, "// In " + name + ".")
+ self.main_source_spec = lldb.SBFileSpec(self.main_source)
def do_step(self, step_type, destination_line_entry, test_stack_depth):
expected_stack_depth = self.thread.GetNumFrames()
@@ -55,58 +70,79 @@ class TestInlineStepping(TestBase):
elif step_type == "over":
self.thread.StepOver()
else:
- self.fail ("Unrecognized step type: " + step_type)
+ self.fail("Unrecognized step type: " + step_type)
- threads = lldbutil.get_stopped_threads (self.process, lldb.eStopReasonPlanComplete)
+ threads = lldbutil.get_stopped_threads(
+ self.process, lldb.eStopReasonPlanComplete)
if len(threads) != 1:
destination_description = lldb.SBStream()
destination_line_entry.GetDescription(destination_description)
- self.fail ("Failed to stop due to step " + step_type + " operation stepping to: " + destination_description.GetData())
+ self.fail(
+ "Failed to stop due to step " +
+ step_type +
+ " operation stepping to: " +
+ destination_description.GetData())
self.thread = threads[0]
stop_line_entry = self.thread.GetFrameAtIndex(0).GetLineEntry()
- self.assertTrue (stop_line_entry.IsValid(), "Stop line entry was not valid.")
-
- # Don't use the line entry equal operator because we don't care about the column number.
- stop_at_right_place = (stop_line_entry.GetFileSpec() == destination_line_entry.GetFileSpec() and stop_line_entry.GetLine() == destination_line_entry.GetLine())
- if stop_at_right_place == False:
+ self.assertTrue(
+ stop_line_entry.IsValid(),
+ "Stop line entry was not valid.")
+
+ # Don't use the line entry equal operator because we don't care about
+ # the column number.
+ stop_at_right_place = (stop_line_entry.GetFileSpec() == destination_line_entry.GetFileSpec(
+ ) and stop_line_entry.GetLine() == destination_line_entry.GetLine())
+ if not stop_at_right_place:
destination_description = lldb.SBStream()
destination_line_entry.GetDescription(destination_description)
actual_description = lldb.SBStream()
stop_line_entry.GetDescription(actual_description)
- self.fail ("Step " + step_type + " stopped at wrong place: expected: " + destination_description.GetData() + " got: " + actual_description.GetData() + ".")
+ self.fail(
+ "Step " +
+ step_type +
+ " stopped at wrong place: expected: " +
+ destination_description.GetData() +
+ " got: " +
+ actual_description.GetData() +
+ ".")
real_stack_depth = self.thread.GetNumFrames()
if test_stack_depth and real_stack_depth != expected_stack_depth:
destination_description = lldb.SBStream()
destination_line_entry.GetDescription(destination_description)
- self.fail ("Step %s to %s got wrong number of frames, should be: %d was: %d."%(step_type, destination_description.GetData(), expected_stack_depth, real_stack_depth))
-
+ self.fail(
+ "Step %s to %s got wrong number of frames, should be: %d was: %d." %
+ (step_type,
+ destination_description.GetData(),
+ expected_stack_depth,
+ real_stack_depth))
+
def run_step_sequence(self, step_sequence):
"""This function takes a list of duples instructing how to run the program. The first element in each duple is
a source pattern for the target location, and the second is the operation that will take you from the current
source location to the target location. It will then run all the steps in the sequence.
- It will check that you arrived at the expected source location at each step, and that the stack depth changed
+ It will check that you arrived at the expected source location at each step, and that the stack depth changed
correctly for the operation in the sequence."""
target_line_entry = lldb.SBLineEntry()
target_line_entry.SetFileSpec(self.main_source_spec)
test_stack_depth = True
- # Work around for <rdar://problem/16363195>, the darwin unwinder seems flakey about whether it duplicates the first frame
+ # Work around for <rdar://problem/16363195>, the darwin unwinder seems flakey about whether it duplicates the first frame
# or not, which makes counting stack depth unreliable.
if self.platformIsDarwin():
test_stack_depth = False
for step_pattern in step_sequence:
- step_stop_line = line_number (self.main_source, step_pattern[0])
+ step_stop_line = line_number(self.main_source, step_pattern[0])
target_line_entry.SetLine(step_stop_line)
- self.do_step (step_pattern[1], target_line_entry, test_stack_depth)
-
+ self.do_step(step_pattern[1], target_line_entry, test_stack_depth)
+
def inline_stepping(self):
"""Use Python APIs to test stepping over and hitting breakpoints."""
exe = os.path.join(os.getcwd(), "a.out")
@@ -114,19 +150,22 @@ class TestInlineStepping(TestBase):
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
- break_1_in_main = target.BreakpointCreateBySourceRegex ('// Stop here and step over to set up stepping over.', self.main_source_spec)
+ break_1_in_main = target.BreakpointCreateBySourceRegex(
+ '// Stop here and step over to set up stepping over.', self.main_source_spec)
self.assertTrue(break_1_in_main, VALID_BREAKPOINT)
# Now launch the process, and do not stop at entry point.
- self.process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ self.process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(self.process, PROCESS_IS_VALID)
# The stop reason of the thread should be breakpoint.
- threads = lldbutil.get_threads_stopped_at_breakpoint (self.process, break_1_in_main)
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ self.process, break_1_in_main)
if len(threads) != 1:
- self.fail ("Failed to stop at first breakpoint in main.")
+ self.fail("Failed to stop at first breakpoint in main.")
self.thread = threads[0]
@@ -135,60 +174,73 @@ class TestInlineStepping(TestBase):
# gets set past the insertion line in the function.
# Then test stepping over a simple inlined function. Note, to test all the parts of the inlined stepping
# the calls inline_stepping_1 and inline_stepping_2 should line up at the same address, that way we will test
- # the "virtual" stepping.
+ # the "virtual" stepping.
# FIXME: Put in a check to see if that is true and warn if it is not.
- step_sequence = [["// At inline_trivial_1 called from main.", "over"],
+ step_sequence = [["// At inline_trivial_1 called from main.", "over"],
["// At first call of caller_trivial_1 in main.", "over"]]
self.run_step_sequence(step_sequence)
-
+
# Now step from caller_ref_1 all the way into called_by_inline_trivial
- step_sequence = [["// In caller_trivial_1.", "into"],
- ["// In caller_trivial_2.", "into"],
+ step_sequence = [["// In caller_trivial_1.", "into"],
+ ["// In caller_trivial_2.", "into"],
["// In inline_trivial_1.", "into"],
["// In inline_trivial_2.", "into"],
["// At caller_by_inline_trivial in inline_trivial_2.", "over"],
["// In called_by_inline_trivial.", "into"]]
self.run_step_sequence(step_sequence)
- # Now run to the inline_trivial_1 just before the immediate step into inline_trivial_2:
+ # Now run to the inline_trivial_1 just before the immediate step into
+ # inline_trivial_2:
- break_2_in_main = target.BreakpointCreateBySourceRegex ('// At second call of caller_trivial_1 in main.', self.main_source_spec)
+ break_2_in_main = target.BreakpointCreateBySourceRegex(
+ '// At second call of caller_trivial_1 in main.', self.main_source_spec)
self.assertTrue(break_2_in_main, VALID_BREAKPOINT)
- threads = lldbutil.continue_to_breakpoint (self.process, break_2_in_main)
- self.assertTrue (len(threads) == 1, "Successfully ran to call site of second caller_trivial_1 call.")
+ threads = lldbutil.continue_to_breakpoint(
+ self.process, break_2_in_main)
+ self.assertTrue(
+ len(threads) == 1,
+ "Successfully ran to call site of second caller_trivial_1 call.")
self.thread = threads[0]
-
- step_sequence = [["// In caller_trivial_1.", "into"],
- ["// In caller_trivial_2.", "into"],
+
+ step_sequence = [["// In caller_trivial_1.", "into"],
+ ["// In caller_trivial_2.", "into"],
["// In inline_trivial_1.", "into"]]
self.run_step_sequence(step_sequence)
- # Then call some trivial function, and make sure we end up back where we were in the inlined call stack:
-
+ # Then call some trivial function, and make sure we end up back where
+ # we were in the inlined call stack:
+
frame = self.thread.GetFrameAtIndex(0)
before_line_entry = frame.GetLineEntry()
- value = frame.EvaluateExpression ("function_to_call()")
+ value = frame.EvaluateExpression("function_to_call()")
after_line_entry = frame.GetLineEntry()
- self.assertTrue (before_line_entry.GetLine() == after_line_entry.GetLine(), "Line entry before and after function calls are the same.")
+ self.assertTrue(
+ before_line_entry.GetLine() == after_line_entry.GetLine(),
+ "Line entry before and after function calls are the same.")
- # Now make sure stepping OVER in the middle of the stack works, and then check finish from the inlined frame:
+ # Now make sure stepping OVER in the middle of the stack works, and
+ # then check finish from the inlined frame:
step_sequence = [["// At increment in inline_trivial_1.", "over"],
["// At increment in caller_trivial_2.", "out"]]
self.run_step_sequence(step_sequence)
+ # Now run to the place in main just before the first call to
+ # caller_ref_1:
- # Now run to the place in main just before the first call to caller_ref_1:
-
- break_3_in_main = target.BreakpointCreateBySourceRegex ('// At first call of caller_ref_1 in main.', self.main_source_spec)
+ break_3_in_main = target.BreakpointCreateBySourceRegex(
+ '// At first call of caller_ref_1 in main.', self.main_source_spec)
self.assertTrue(break_3_in_main, VALID_BREAKPOINT)
- threads = lldbutil.continue_to_breakpoint (self.process, break_3_in_main)
- self.assertTrue (len(threads) == 1, "Successfully ran to call site of first caller_ref_1 call.")
+ threads = lldbutil.continue_to_breakpoint(
+ self.process, break_3_in_main)
+ self.assertTrue(
+ len(threads) == 1,
+ "Successfully ran to call site of first caller_ref_1 call.")
self.thread = threads[0]
step_sequence = [["// In caller_ref_1.", "into"],
@@ -201,7 +253,7 @@ class TestInlineStepping(TestBase):
["// At increment in inline_ref_1.", "over"],
["// In caller_ref_2.", "out"],
["// At increment in caller_ref_2.", "over"]]
- self.run_step_sequence (step_sequence)
+ self.run_step_sequence(step_sequence)
def inline_stepping_step_over(self):
"""Use Python APIs to test stepping over and hitting breakpoints."""
@@ -210,26 +262,29 @@ class TestInlineStepping(TestBase):
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
- break_1_in_main = target.BreakpointCreateBySourceRegex ('// At second call of caller_ref_1 in main.', self.main_source_spec)
+ break_1_in_main = target.BreakpointCreateBySourceRegex(
+ '// At second call of caller_ref_1 in main.', self.main_source_spec)
self.assertTrue(break_1_in_main, VALID_BREAKPOINT)
# Now launch the process, and do not stop at entry point.
- self.process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ self.process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(self.process, PROCESS_IS_VALID)
# The stop reason of the thread should be breakpoint.
- threads = lldbutil.get_threads_stopped_at_breakpoint (self.process, break_1_in_main)
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ self.process, break_1_in_main)
if len(threads) != 1:
- self.fail ("Failed to stop at first breakpoint in main.")
+ self.fail("Failed to stop at first breakpoint in main.")
self.thread = threads[0]
step_sequence = [["// In caller_ref_1.", "into"],
["// In caller_ref_2.", "into"],
["// At increment in caller_ref_2.", "over"]]
- self.run_step_sequence (step_sequence)
+ self.run_step_sequence(step_sequence)
def step_in_template(self):
"""Use Python APIs to test stepping in to templated functions."""
@@ -238,30 +293,38 @@ class TestInlineStepping(TestBase):
target = self.dbg.CreateTarget(exe)
self.assertTrue(target, VALID_TARGET)
- break_1_in_main = target.BreakpointCreateBySourceRegex ('// Call max_value template', self.main_source_spec)
+ break_1_in_main = target.BreakpointCreateBySourceRegex(
+ '// Call max_value template', self.main_source_spec)
self.assertTrue(break_1_in_main, VALID_BREAKPOINT)
-
- break_2_in_main = target.BreakpointCreateBySourceRegex ('// Call max_value specialized', self.main_source_spec)
+
+ break_2_in_main = target.BreakpointCreateBySourceRegex(
+ '// Call max_value specialized', self.main_source_spec)
self.assertTrue(break_2_in_main, VALID_BREAKPOINT)
# Now launch the process, and do not stop at entry point.
- self.process = target.LaunchSimple (None, None, self.get_process_working_directory())
+ self.process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(self.process, PROCESS_IS_VALID)
# The stop reason of the thread should be breakpoint.
- threads = lldbutil.get_threads_stopped_at_breakpoint (self.process, break_1_in_main)
+ threads = lldbutil.get_threads_stopped_at_breakpoint(
+ self.process, break_1_in_main)
if len(threads) != 1:
- self.fail ("Failed to stop at first breakpoint in main.")
+ self.fail("Failed to stop at first breakpoint in main.")
self.thread = threads[0]
step_sequence = [["// In max_value template", "into"]]
self.run_step_sequence(step_sequence)
-
- threads = lldbutil.continue_to_breakpoint (self.process, break_2_in_main)
- self.assertEqual(len(threads), 1, "Successfully ran to call site of second caller_trivial_1 call.")
+
+ threads = lldbutil.continue_to_breakpoint(
+ self.process, break_2_in_main)
+ self.assertEqual(
+ len(threads),
+ 1,
+ "Successfully ran to call site of second caller_trivial_1 call.")
self.thread = threads[0]
-
+
step_sequence = [["// In max_value specialized", "into"]]
self.run_step_sequence(step_sequence)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py Tue Sep 6 15:57:50 2016
@@ -15,7 +15,9 @@ class JITLoaderGDBTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @skipTestIfFn(lambda : "Skipped because the test crashes the test runner", bugnumber="llvm.org/pr24702")
+ @skipTestIfFn(
+ lambda: "Skipped because the test crashes the test runner",
+ bugnumber="llvm.org/pr24702")
@unittest2.expectedFailure("llvm.org/pr24702")
def test_bogus_values(self):
"""Test that we handle inferior misusing the GDB JIT interface"""
@@ -27,10 +29,12 @@ class JITLoaderGDBTestCase(TestBase):
self.assertTrue(target, VALID_TARGET)
# launch the process, do not stop at entry point.
- process = target.LaunchSimple(None, None, self.get_process_working_directory())
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory())
self.assertTrue(process, PROCESS_IS_VALID)
- # The inferior will now pass bogus values over the interface. Make sure we don't crash.
+ # The inferior will now pass bogus values over the interface. Make sure
+ # we don't crash.
self.assertEqual(process.GetState(), lldb.eStateExited)
self.assertEqual(process.GetExitStatus(), 0)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py Tue Sep 6 15:57:50 2016
@@ -4,7 +4,6 @@ Test that argdumper is a viable launchin
from __future__ import print_function
-
import lldb
import os
import time
@@ -12,40 +11,50 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LaunchWithShellExpandTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr24778 llvm.org/pr22627")
+ @expectedFailureAll(
+ oslist=[
+ "windows",
+ "linux",
+ "freebsd"],
+ bugnumber="llvm.org/pr24778 llvm.org/pr22627")
def test(self):
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
-
+ exe = os.path.join(os.getcwd(), "a.out")
+
self.runCmd("target create %s" % exe)
-
+
# Create the target
target = self.dbg.CreateTarget(exe)
-
+
# Create any breakpoints we need
- breakpoint = target.BreakpointCreateBySourceRegex ('break here', lldb.SBFileSpec ("main.cpp", False))
+ breakpoint = target.BreakpointCreateBySourceRegex(
+ 'break here', lldb.SBFileSpec("main.cpp", False))
self.assertTrue(breakpoint, VALID_BREAKPOINT)
- self.runCmd("process launch -X true -w %s -- fi*.tx? () > <" % (os.getcwd()))
+ self.runCmd(
+ "process launch -X true -w %s -- fi*.tx? () > <" %
+ (os.getcwd()))
process = self.process()
self.assertTrue(process.GetState() == lldb.eStateStopped,
STOPPED_DUE_TO_BREAKPOINT)
- thread = process.GetThreadAtIndex (0)
+ thread = process.GetThreadAtIndex(0)
- self.assertTrue (thread.IsValid(),
- "Process stopped at 'main' should have a valid thread");
+ self.assertTrue(thread.IsValid(),
+ "Process stopped at 'main' should have a valid thread")
stop_reason = thread.GetStopReason()
-
- self.assertTrue (stop_reason == lldb.eStopReasonBreakpoint,
- "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint");
+
+ self.assertTrue(
+ stop_reason == lldb.eStopReasonBreakpoint,
+ "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint")
self.expect("frame variable argv[1]", substrs=['file1.txt'])
self.expect("frame variable argv[2]", substrs=['file2.txt'])
@@ -54,47 +63,57 @@ class LaunchWithShellExpandTestCase(Test
self.expect("frame variable argv[5]", substrs=['()'])
self.expect("frame variable argv[6]", substrs=['>'])
self.expect("frame variable argv[7]", substrs=['<'])
- self.expect("frame variable argv[5]", substrs=['file5.tyx'], matching=False)
- self.expect("frame variable argv[8]", substrs=['file5.tyx'], matching=False)
+ self.expect(
+ "frame variable argv[5]",
+ substrs=['file5.tyx'],
+ matching=False)
+ self.expect(
+ "frame variable argv[8]",
+ substrs=['file5.tyx'],
+ matching=False)
self.runCmd("process kill")
- self.runCmd('process launch -X true -w %s -- "foo bar"' % (os.getcwd()))
-
+ self.runCmd(
+ 'process launch -X true -w %s -- "foo bar"' %
+ (os.getcwd()))
+
process = self.process()
self.assertTrue(process.GetState() == lldb.eStateStopped,
STOPPED_DUE_TO_BREAKPOINT)
- thread = process.GetThreadAtIndex (0)
+ thread = process.GetThreadAtIndex(0)
- self.assertTrue (thread.IsValid(),
- "Process stopped at 'main' should have a valid thread");
+ self.assertTrue(thread.IsValid(),
+ "Process stopped at 'main' should have a valid thread")
stop_reason = thread.GetStopReason()
-
- self.assertTrue (stop_reason == lldb.eStopReasonBreakpoint,
- "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint");
-
+
+ self.assertTrue(
+ stop_reason == lldb.eStopReasonBreakpoint,
+ "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint")
+
self.expect("frame variable argv[1]", substrs=['foo bar'])
self.runCmd("process kill")
self.runCmd('process launch -X true -w %s -- foo\ bar' % (os.getcwd()))
-
+
process = self.process()
self.assertTrue(process.GetState() == lldb.eStateStopped,
STOPPED_DUE_TO_BREAKPOINT)
- thread = process.GetThreadAtIndex (0)
+ thread = process.GetThreadAtIndex(0)
- self.assertTrue (thread.IsValid(),
- "Process stopped at 'main' should have a valid thread");
+ self.assertTrue(thread.IsValid(),
+ "Process stopped at 'main' should have a valid thread")
stop_reason = thread.GetStopReason()
-
- self.assertTrue (stop_reason == lldb.eStopReasonBreakpoint,
- "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint");
-
+
+ self.assertTrue(
+ stop_reason == lldb.eStopReasonBreakpoint,
+ "Thread in process stopped in 'main' should have a stop reason of eStopReasonBreakpoint")
+
self.expect("frame variable argv[1]", substrs=['foo bar'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/llvm/TestLLVM.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/llvm/TestLLVM.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/llvm/TestLLVM.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/llvm/TestLLVM.py Tue Sep 6 15:57:50 2016
@@ -5,24 +5,26 @@ Test lldb 'commands regex' command which
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestHomeDirectory(TestBase):
mydir = TestBase.compute_mydir(__file__)
- @expectedFailureAll(hostoslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+ @expectedFailureAll(
+ hostoslist=["windows"],
+ bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
@no_debug_info_test
def test_tilde_home_directory(self):
- """Test that we can resolve "~/" in paths correctly.
+ """Test that we can resolve "~/" in paths correctly.
When a path starts with "~/", we use llvm::sys::path::home_directory() to
resolve the home directory. This currently relies on "HOME" being set in the
- environment. While this is usually set, we can't rely upon that. We might
+ environment. While this is usually set, we can't rely upon that. We might
eventually get a fix into llvm::sys::path::home_directory() so it doesn't rely
on having to have an environment variable set, but until then we have work around
code in FileSpec::ResolveUsername (llvm::SmallVectorImpl<char> &path) to ensure
@@ -31,7 +33,9 @@ class TestHomeDirectory(TestBase):
import pexpect
prompt = "(lldb) "
- child = pexpect.spawn('%s --no-use-colors %s' % (lldbtest_config.lldbExec, self.lldbOption))
+ child = pexpect.spawn(
+ '%s --no-use-colors %s' %
+ (lldbtest_config.lldbExec, self.lldbOption))
# Turn on logging for what the child sends back.
if self.TraceOn():
child.logfile_read = sys.stdout
@@ -39,7 +43,7 @@ class TestHomeDirectory(TestBase):
self.child = child
# Resolve "~/." to the full path of our home directory + "/."
- if 'HOME' in os.environ:
+ if 'HOME' in os.environ:
home_dir = os.environ['HOME']
if self.TraceOn():
print("home directory is: '%s'" % (home_dir))
@@ -49,11 +53,14 @@ class TestHomeDirectory(TestBase):
child.sendline('''script str(lldb.SBFileSpec("~/.", True))''')
child.expect_exact(home_dir)
child.expect_exact(prompt)
- child.sendline('''script import os; os.unsetenv('HOME'); str(lldb.SBFileSpec("~/", True))''');
+ child.sendline(
+ '''script import os; os.unsetenv('HOME'); str(lldb.SBFileSpec("~/", True))''')
child.expect_exact(home_dir)
child.expect_exact(prompt)
elif self.TraceOn():
- print('''home directory "%s" doesn't exist, skipping home directory test''' % (home_dir))
+ print(
+ '''home directory "%s" doesn't exist, skipping home directory test''' %
+ (home_dir))
elif self.TraceOn():
print('"HOME" not in environment, skipping home directory test')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py Tue Sep 6 15:57:50 2016
@@ -5,18 +5,19 @@ Test that breakpoint by symbol name work
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
- at skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
+
+ at skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
class LoadUnloadTestCase(TestBase):
- def getCategories (self):
+ def getCategories(self):
return ['basic_process']
mydir = TestBase.compute_mydir(__file__)
@@ -25,19 +26,30 @@ class LoadUnloadTestCase(TestBase):
# Call super's setUp().
TestBase.setUp(self)
# Find the line number to break for main.cpp.
- self.line = line_number('main.cpp',
- '// Set break point at this line for test_lldb_process_load_and_unload_commands().')
- self.line_d_function = line_number('d.cpp',
- '// Find this line number within d_dunction().')
+ self.line = line_number(
+ 'main.cpp',
+ '// Set break point at this line for test_lldb_process_load_and_unload_commands().')
+ self.line_d_function = line_number(
+ 'd.cpp', '// Find this line number within d_dunction().')
if not self.platformIsDarwin():
if not lldb.remote_platform and "LD_LIBRARY_PATH" in os.environ:
- self.runCmd("settings set target.env-vars " + self.dylibPath + "=" + os.environ["LD_LIBRARY_PATH"] + ":" + os.getcwd())
+ self.runCmd(
+ "settings set target.env-vars " +
+ self.dylibPath +
+ "=" +
+ os.environ["LD_LIBRARY_PATH"] +
+ ":" +
+ os.getcwd())
else:
if lldb.remote_platform:
wd = lldb.remote_platform.GetWorkingDirectory()
else:
wd = os.getcwd()
- self.runCmd("settings set target.env-vars " + self.dylibPath + "=" + wd)
+ self.runCmd(
+ "settings set target.env-vars " +
+ self.dylibPath +
+ "=" +
+ wd)
def copy_shlibs_to_remote(self, hidden_dir=False):
""" Copies the shared libs required by this test suite to remote.
@@ -72,9 +84,9 @@ class LoadUnloadTestCase(TestBase):
"Unable copy 'libloadunload_d.so' to '%s'.\n>>> %s" %
(wd, err.GetCString()))
- @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
+ @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
@not_remote_testsuite_ready
- @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
+ @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
def test_modules_search_paths(self):
"""Test target modules list after loading a different copy of the library libd.dylib, and verifies that it works with 'target modules search-paths add'."""
@@ -96,17 +108,22 @@ class LoadUnloadTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
self.expect("target modules list",
- substrs = [old_dylib])
- #self.expect("target modules list -t 3",
+ substrs=[old_dylib])
+ # self.expect("target modules list -t 3",
# patterns = ["%s-[^-]*-[^-]*" % self.getArchitecture()])
# Add an image search path substitution pair.
- self.runCmd("target modules search-paths add %s %s" % (os.getcwd(), new_dir))
+ self.runCmd(
+ "target modules search-paths add %s %s" %
+ (os.getcwd(), new_dir))
self.expect("target modules search-paths list",
- substrs = [os.getcwd(), new_dir])
+ substrs=[os.getcwd(), new_dir])
- self.expect("target modules search-paths query %s" % os.getcwd(), "Image search path successfully transformed",
- substrs = [new_dir])
+ self.expect(
+ "target modules search-paths query %s" %
+ os.getcwd(),
+ "Image search path successfully transformed",
+ substrs=[new_dir])
# Obliterate traces of libd from the old location.
os.remove(old_dylib)
@@ -118,16 +135,19 @@ class LoadUnloadTestCase(TestBase):
self.runCmd("settings show target.env-vars")
remove_dyld_path_cmd = "settings remove target.env-vars " + self.dylibPath
- self.addTearDownHook(lambda: self.dbg.HandleCommand(remove_dyld_path_cmd))
+ self.addTearDownHook(
+ lambda: self.dbg.HandleCommand(remove_dyld_path_cmd))
self.runCmd("run")
- self.expect("target modules list", "LLDB successfully locates the relocated dynamic library",
- substrs = [new_dylib])
-
- @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
- @expectedFailureAndroid # wrong source file shows up for hidden library
- @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
+ self.expect(
+ "target modules list",
+ "LLDB successfully locates the relocated dynamic library",
+ substrs=[new_dylib])
+
+ @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
+ @expectedFailureAndroid # wrong source file shows up for hidden library
+ @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
def test_dyld_library_path(self):
"""Test (DY)LD_LIBRARY_PATH after moving libd.dylib, which defines d_function, somewhere else."""
@@ -156,15 +176,17 @@ class LoadUnloadTestCase(TestBase):
old_dylib = os.path.join(old_dir, dylibName)
remove_dyld_path_cmd = "settings remove target.env-vars " + self.dylibPath
- self.addTearDownHook(lambda: self.dbg.HandleCommand(remove_dyld_path_cmd))
+ self.addTearDownHook(
+ lambda: self.dbg.HandleCommand(remove_dyld_path_cmd))
# For now we don't track (DY)LD_LIBRARY_PATH, so the old library will be in
# the modules list.
self.expect("target modules list",
- substrs = [os.path.basename(old_dylib)],
+ substrs=[os.path.basename(old_dylib)],
matching=True)
- lldbutil.run_break_set_by_file_and_line (self, "d.cpp", self.line_d_function, num_expected_locations=1)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "d.cpp", self.line_d_function, num_expected_locations=1)
# After run, make sure the non-hidden library is picked up.
self.expect("run", substrs=["return", "700"])
@@ -180,9 +202,14 @@ class LoadUnloadTestCase(TestBase):
# This time, the hidden library should be picked up.
self.expect("run", substrs=["return", "12345"])
- @expectedFailureAll(bugnumber="llvm.org/pr25805", hostoslist=["windows"], compiler="gcc", archs=["i386"], triple='.*-android')
- @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
- @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
+ @expectedFailureAll(
+ bugnumber="llvm.org/pr25805",
+ hostoslist=["windows"],
+ compiler="gcc",
+ archs=["i386"],
+ triple='.*-android')
+ @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
+ @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
def test_lldb_process_load_and_unload_commands(self):
"""Test that lldb process load/unload command work correctly."""
@@ -196,7 +223,8 @@ class LoadUnloadTestCase(TestBase):
# Break at main.cpp before the call to dlopen().
# Use lldb's process load command to load the dylib, instead.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
@@ -211,13 +239,23 @@ class LoadUnloadTestCase(TestBase):
dylibName = 'libloadunload_a.so'
# Make sure that a_function does not exist at this point.
- self.expect("image lookup -n a_function", "a_function should not exist yet",
- error=True, matching=False, patterns = ["1 match found"])
+ self.expect(
+ "image lookup -n a_function",
+ "a_function should not exist yet",
+ error=True,
+ matching=False,
+ patterns=["1 match found"])
# Use lldb 'process load' to load the dylib.
- self.expect("process load %s --install" % dylibName, "%s loaded correctly" % dylibName,
- patterns = ['Loading "%s".*ok' % dylibName,
- 'Image [0-9]+ loaded'])
+ self.expect(
+ "process load %s --install" %
+ dylibName,
+ "%s loaded correctly" %
+ dylibName,
+ patterns=[
+ 'Loading "%s".*ok' %
+ dylibName,
+ 'Image [0-9]+ loaded'])
# Search for and match the "Image ([0-9]+) loaded" pattern.
output = self.res.GetOutput()
@@ -230,16 +268,26 @@ class LoadUnloadTestCase(TestBase):
index = match.group(1)
# Now we should have an entry for a_function.
- self.expect("image lookup -n a_function", "a_function should now exist",
- patterns = ["1 match found .*%s" % dylibName])
+ self.expect(
+ "image lookup -n a_function",
+ "a_function should now exist",
+ patterns=[
+ "1 match found .*%s" %
+ dylibName])
# Use lldb 'process unload' to unload the dylib.
- self.expect("process unload %s" % index, "%s unloaded correctly" % dylibName,
- patterns = ["Unloading .* with index %s.*ok" % index])
+ self.expect(
+ "process unload %s" %
+ index,
+ "%s unloaded correctly" %
+ dylibName,
+ patterns=[
+ "Unloading .* with index %s.*ok" %
+ index])
self.runCmd("process continue")
- @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
+ @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
def test_load_unload(self):
"""Test breakpoint by name works correctly with dlopen'ing."""
@@ -251,19 +299,20 @@ class LoadUnloadTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break by function name a_function (not yet loaded).
- lldbutil.run_break_set_by_symbol (self, "a_function", num_expected_locations=0)
+ lldbutil.run_break_set_by_symbol(
+ self, "a_function", num_expected_locations=0)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint and at a_function.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'a_function',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'a_function',
+ 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
# Issue the 'contnue' command. We should stop agaian at a_function.
# The stop reason of the thread should be breakpoint and at a_function.
@@ -272,17 +321,17 @@ class LoadUnloadTestCase(TestBase):
# rdar://problem/8508987
# The a_function breakpoint should be encountered twice.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'a_function',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'a_function',
+ 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 2.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 2'])
+ substrs=[' resolved, hit count = 2'])
- @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
- @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
- def test_step_over_load (self):
+ @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
+ @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
+ def test_step_over_load(self):
"""Test stepping over code that loads a shared library works correctly."""
# Invoke the default build rule.
@@ -293,26 +342,29 @@ class LoadUnloadTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break by function name a_function (not yet loaded).
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint and at a_function.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
+
+ self.runCmd(
+ "thread step-over",
+ "Stepping over function that loads library")
- self.runCmd("thread step-over", "Stepping over function that loads library")
-
# The stop reason should be step end.
- self.expect("thread list", "step over succeeded.",
- substrs = ['stopped',
- 'stop reason = step over'])
+ self.expect("thread list", "step over succeeded.",
+ substrs=['stopped',
+ 'stop reason = step over'])
- @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
- @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
+ @skipIfFreeBSD # llvm.org/pr14424 - missing FreeBSD Makefiles/testcase support
+ @skipIfWindows # Windows doesn't have dlopen and friends, dynamic libraries work differently
@unittest2.expectedFailure("llvm.org/pr25806")
- def test_static_init_during_load (self):
+ def test_static_init_during_load(self):
"""Test that we can set breakpoints correctly in static initializers"""
self.build()
@@ -321,33 +373,36 @@ class LoadUnloadTestCase(TestBase):
exe = os.path.join(os.getcwd(), "a.out")
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
- a_init_bp_num = lldbutil.run_break_set_by_symbol(self, "a_init", num_expected_locations=0)
- b_init_bp_num = lldbutil.run_break_set_by_symbol(self, "b_init", num_expected_locations=0)
- d_init_bp_num = lldbutil.run_break_set_by_symbol(self, "d_init", num_expected_locations=1)
+ a_init_bp_num = lldbutil.run_break_set_by_symbol(
+ self, "a_init", num_expected_locations=0)
+ b_init_bp_num = lldbutil.run_break_set_by_symbol(
+ self, "b_init", num_expected_locations=0)
+ d_init_bp_num = lldbutil.run_break_set_by_symbol(
+ self, "d_init", num_expected_locations=1)
self.runCmd("run", RUN_SUCCEEDED)
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'd_init',
- 'stop reason = breakpoint %d' % d_init_bp_num])
+ substrs=['stopped',
+ 'd_init',
+ 'stop reason = breakpoint %d' % d_init_bp_num])
self.runCmd("continue")
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'a_init',
- 'stop reason = breakpoint %d' % a_init_bp_num])
+ substrs=['stopped',
+ 'a_init',
+ 'stop reason = breakpoint %d' % a_init_bp_num])
self.expect("thread backtrace",
- substrs = ['a_init',
- 'dlopen',
- 'main'])
+ substrs=['a_init',
+ 'dlopen',
+ 'main'])
self.runCmd("continue")
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'b_init',
- 'stop reason = breakpoint %d' % b_init_bp_num])
+ substrs=['stopped',
+ 'b_init',
+ 'stop reason = breakpoint %d' % b_init_bp_num])
self.expect("thread backtrace",
- substrs = ['b_init',
- 'dlopen',
- 'main'])
+ substrs=['b_init',
+ 'dlopen',
+ 'main'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,13 @@ Test the use of setjmp/longjmp for non-l
from __future__ import print_function
-
import os
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class LongjmpTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -19,8 +19,8 @@ class LongjmpTestCase(TestBase):
def setUp(self):
TestBase.setUp(self)
- @skipIfDarwin # llvm.org/pr16769: LLDB on Mac OS X dies in function ReadRegisterBytes in GDBRemoteRegisterContext.cpp
- @skipIfFreeBSD # llvm.org/pr17214
+ @skipIfDarwin # llvm.org/pr16769: LLDB on Mac OS X dies in function ReadRegisterBytes in GDBRemoteRegisterContext.cpp
+ @skipIfFreeBSD # llvm.org/pr17214
@expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr20231")
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
def test_step_out(self):
@@ -28,8 +28,8 @@ class LongjmpTestCase(TestBase):
self.build()
self.step_out()
- @skipIfDarwin # llvm.org/pr16769: LLDB on Mac OS X dies in function ReadRegisterBytes in GDBRemoteRegisterContext.cpp
- @skipIfFreeBSD # llvm.org/pr17214
+ @skipIfDarwin # llvm.org/pr16769: LLDB on Mac OS X dies in function ReadRegisterBytes in GDBRemoteRegisterContext.cpp
+ @skipIfFreeBSD # llvm.org/pr17214
@expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr20231")
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
def test_step_over(self):
@@ -37,8 +37,8 @@ class LongjmpTestCase(TestBase):
self.build()
self.step_over()
- @skipIfDarwin # llvm.org/pr16769: LLDB on Mac OS X dies in function ReadRegisterBytes in GDBRemoteRegisterContext.cpp
- @skipIfFreeBSD # llvm.org/pr17214
+ @skipIfDarwin # llvm.org/pr16769: LLDB on Mac OS X dies in function ReadRegisterBytes in GDBRemoteRegisterContext.cpp
+ @skipIfFreeBSD # llvm.org/pr17214
@expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr20231")
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
def test_step_back_out(self):
@@ -52,19 +52,20 @@ class LongjmpTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break in main().
- lldbutil.run_break_set_by_symbol (self, symbol, num_expected_locations=-1)
+ lldbutil.run_break_set_by_symbol(
+ self, symbol, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
def check_status(self):
# Note: Depending on the generated mapping of DWARF to assembly,
# the process may have stopped or exited.
self.expect("process status", PROCESS_STOPPED,
- patterns = ['Process .* exited with status = 0'])
+ patterns=['Process .* exited with status = 0'])
def step_out(self):
self.start_test("do_jump")
@@ -79,7 +80,7 @@ class LongjmpTestCase(TestBase):
def step_back_out(self):
self.start_test("main")
-
+
self.runCmd("thread step-over", RUN_SUCCEEDED)
self.runCmd("thread step-in", RUN_SUCCEEDED)
self.runCmd("thread step-out", RUN_SUCCEEDED)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/cache/TestMemoryCache.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/cache/TestMemoryCache.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/cache/TestMemoryCache.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/cache/TestMemoryCache.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test the MemoryCache L1 flush.
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class MemoryCacheTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -31,17 +32,18 @@ class MemoryCacheTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break in main() after the variables are assigned values.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
# Read a chunk of memory containing &my_ints[0]. The number of bytes read
# must be greater than m_L2_cache_line_byte_size to make sure the L1
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/find/TestMemoryFind.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/find/TestMemoryFind.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/find/TestMemoryFind.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/find/TestMemoryFind.py Tue Sep 6 15:57:50 2016
@@ -5,14 +5,15 @@ Test the 'memory find' command.
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
from lldbsuite.test.decorators import *
+
class MemoryFindTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -30,31 +31,40 @@ class MemoryFindTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break in main() aftre the variables are assigned values.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
# Test the memory find commands.
- self.expect('memory find -s "in const" `stringdata` `stringdata+(int)strlen(stringdata)`',
- substrs = ['data found at location: 0x', '69 6e 20 63', 'in const'])
-
- self.expect('memory find -e "(uint8_t)0x22" `&bytedata[0]` `&bytedata[15]`',
- substrs = ['data found at location: 0x', '22 33 44 55 66'])
-
- self.expect('memory find -e "(uint8_t)0x22" `&bytedata[0]` `&bytedata[2]`',
- substrs = ['data not found within the range.'])
+ self.expect(
+ 'memory find -s "in const" `stringdata` `stringdata+(int)strlen(stringdata)`',
+ substrs=[
+ 'data found at location: 0x',
+ '69 6e 20 63',
+ 'in const'])
+
+ self.expect(
+ 'memory find -e "(uint8_t)0x22" `&bytedata[0]` `&bytedata[15]`',
+ substrs=[
+ 'data found at location: 0x',
+ '22 33 44 55 66'])
+
+ self.expect(
+ 'memory find -e "(uint8_t)0x22" `&bytedata[0]` `&bytedata[2]`',
+ substrs=['data not found within the range.'])
self.expect('memory find -s "nothere" `stringdata` `stringdata+5`',
- substrs = ['data not found within the range.'])
+ substrs=['data not found within the range.'])
self.expect('memory find -s "nothere" `stringdata` `stringdata+10`',
- substrs = ['data not found within the range.'])
+ substrs=['data not found within the range.'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test the 'memory read' command.
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class MemoryReadTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,17 +30,18 @@ class MemoryReadTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break in main() aftre the variables are assigned values.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
# Test the memory read commands.
@@ -61,39 +63,58 @@ class MemoryReadTestCase(TestBase):
# 0x7fff5fbff9a4: {0x00000000}
# 0x7fff5fbff9a8: {0x0ec0bf27}
# 0x7fff5fbff9ac: {0x215db505}
- self.runCmd("memory read --format uint32_t[] --size 4 --count 4 `&argc`")
+ self.runCmd(
+ "memory read --format uint32_t[] --size 4 --count 4 `&argc`")
lines = self.res.GetOutput().splitlines()
for i in range(4):
if i == 0:
# Verify that the printout for argc is correct.
- self.assertTrue(argc == int(lines[i].split(':')[1].strip(' {}'), 0))
+ self.assertTrue(
+ argc == int(
+ lines[i].split(':')[1].strip(' {}'), 0))
addr = int(lines[i].split(':')[0], 0)
# Verify that the printout for addr is incremented correctly.
- self.assertTrue(addr == (address + i*4))
+ self.assertTrue(addr == (address + i * 4))
# (lldb) memory read --format char[] --size 7 --count 1 `&my_string`
# 0x7fff5fbff990: {abcdefg}
- self.expect("memory read --format char[] --size 7 --count 1 `&my_string`",
- substrs = ['abcdefg'])
+ self.expect(
+ "memory read --format char[] --size 7 --count 1 `&my_string`",
+ substrs=['abcdefg'])
# (lldb) memory read --format 'hex float' --size 16 `&argc`
- # 0x7fff5fbff5b0: error: unsupported byte size (16) for hex float format
- self.expect("memory read --format 'hex float' --size 16 `&argc`",
- substrs = ['unsupported byte size (16) for hex float format'])
-
- self.expect("memory read --format 'float' --count 1 --size 8 `&my_double`",
- substrs = ['1234.'])
+ # 0x7fff5fbff5b0: error: unsupported byte size (16) for hex float
+ # format
+ self.expect(
+ "memory read --format 'hex float' --size 16 `&argc`",
+ substrs=['unsupported byte size (16) for hex float format'])
+
+ self.expect(
+ "memory read --format 'float' --count 1 --size 8 `&my_double`",
+ substrs=['1234.'])
# (lldb) memory read --format 'float' --count 1 --size 20 `&my_double`
# 0x7fff5fbff598: error: unsupported byte size (20) for float format
- self.expect("memory read --format 'float' --count 1 --size 20 `&my_double`",
- substrs = ['unsupported byte size (20) for float format'])
+ self.expect(
+ "memory read --format 'float' --count 1 --size 20 `&my_double`",
+ substrs=['unsupported byte size (20) for float format'])
self.expect('memory read --type int --count 5 `&my_ints[0]`',
- substrs=['(int) 0x', '2','4','6','8','10'])
-
- self.expect('memory read --type int --count 5 --format hex `&my_ints[0]`',
- substrs=['(int) 0x', '0x','0a'])
+ substrs=['(int) 0x', '2', '4', '6', '8', '10'])
- self.expect('memory read --type int --count 5 --offset 5 `&my_ints[0]`',
- substrs=['(int) 0x', '12', '14','16','18', '20'])
+ self.expect(
+ 'memory read --type int --count 5 --format hex `&my_ints[0]`',
+ substrs=[
+ '(int) 0x',
+ '0x',
+ '0a'])
+
+ self.expect(
+ 'memory read --type int --count 5 --offset 5 `&my_ints[0]`',
+ substrs=[
+ '(int) 0x',
+ '12',
+ '14',
+ '16',
+ '18',
+ '20'])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/multidebugger_commands/TestMultipleDebuggersCommands.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test that commands do not try and hold o
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class MultipleDebuggersCommandsTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -21,28 +22,33 @@ class MultipleDebuggersCommandsTestCase(
"""Test that commands do not try and hold on to stale CommandInterpreters in a multiple debuggers scenario"""
source_init_files = False
magic_text = "The following commands may relate to 'env'"
-
+
debugger_1 = lldb.SBDebugger.Create(source_init_files)
interpreter_1 = debugger_1.GetCommandInterpreter()
-
+
retobj = lldb.SBCommandReturnObject()
interpreter_1.HandleCommand("apropos env", retobj)
- self.assertTrue(magic_text in str(retobj), "[interpreter_1]: the output does not contain the correct words")
-
- if self.TraceOn(): print(str(retobj))
-
+ self.assertTrue(
+ magic_text in str(retobj),
+ "[interpreter_1]: the output does not contain the correct words")
+
+ if self.TraceOn():
+ print(str(retobj))
+
lldb.SBDebugger.Destroy(debugger_1)
-
+
# now do this again with a different debugger - we shouldn't crash
-
+
debugger_2 = lldb.SBDebugger.Create(source_init_files)
interpreter_2 = debugger_2.GetCommandInterpreter()
-
+
retobj = lldb.SBCommandReturnObject()
interpreter_2.HandleCommand("apropos env", retobj)
- self.assertTrue(magic_text in str(retobj), "[interpreter_2]: the output does not contain the correct words")
-
- if self.TraceOn(): print(str(retobj))
-
+ self.assertTrue(
+ magic_text in str(retobj),
+ "[interpreter_2]: the output does not contain the correct words")
+
+ if self.TraceOn():
+ print(str(retobj))
+
lldb.SBDebugger.Destroy(debugger_2)
-
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/nested_alias/TestNestedAlias.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/nested_alias/TestNestedAlias.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/nested_alias/TestNestedAlias.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/nested_alias/TestNestedAlias.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test that an alias can reference other a
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class NestedAliasTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -29,17 +30,18 @@ class NestedAliasTestCase(TestBase):
self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
# Break in main() aftre the variables are assigned values.
- lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self, "main.cpp", self.line, num_expected_locations=1, loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped', 'stop reason = breakpoint'])
+ substrs=['stopped', 'stop reason = breakpoint'])
# The breakpoint should have a hit count of 1.
self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
- substrs = [' resolved, hit count = 1'])
+ substrs=[' resolved, hit count = 1'])
# This is the function to remove the custom aliases in order to have a
# clean slate for the next test case.
@@ -54,15 +56,38 @@ class NestedAliasTestCase(TestBase):
self.runCmd('command alias read memory read -f A')
self.runCmd('command alias rd read -c 3')
-
- self.expect('memory read -f A -c 3 `&my_ptr[0]`', substrs=['deadbeef', 'main.cpp:', 'feedbeef'])
- self.expect('rd `&my_ptr[0]`', substrs=['deadbeef', 'main.cpp:', 'feedbeef'])
- self.expect('memory read -f A -c 3 `&my_ptr[0]`', substrs=['deadfeed'], matching=False)
+ self.expect(
+ 'memory read -f A -c 3 `&my_ptr[0]`',
+ substrs=[
+ 'deadbeef',
+ 'main.cpp:',
+ 'feedbeef'])
+ self.expect(
+ 'rd `&my_ptr[0]`',
+ substrs=[
+ 'deadbeef',
+ 'main.cpp:',
+ 'feedbeef'])
+
+ self.expect(
+ 'memory read -f A -c 3 `&my_ptr[0]`',
+ substrs=['deadfeed'],
+ matching=False)
self.expect('rd `&my_ptr[0]`', substrs=['deadfeed'], matching=False)
self.runCmd('command alias fo frame variable -O --')
self.runCmd('command alias foself fo self')
-
- self.expect('help foself', substrs=['--show-all-children', '--raw-output'], matching=False)
- self.expect('help foself', substrs=['Show variables for the current', 'stack frame.'], matching=True)
+
+ self.expect(
+ 'help foself',
+ substrs=[
+ '--show-all-children',
+ '--raw-output'],
+ matching=False)
+ self.expect(
+ 'help foself',
+ substrs=[
+ 'Show variables for the current',
+ 'stack frame.'],
+ matching=True)
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py Tue Sep 6 15:57:50 2016
@@ -4,11 +4,11 @@ from out of scope to in scope when stopp
from __future__ import print_function
-
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class NonOverlappingIndexVariableCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -16,7 +16,8 @@ class NonOverlappingIndexVariableCase(Te
def setUp(self):
TestBase.setUp(self)
self.source = 'main.cpp'
- self.line_to_break = line_number(self.source, '// Set breakpoint here.')
+ self.line_to_break = line_number(
+ self.source, '// Set breakpoint here.')
# rdar://problem/9890530
def test_eval_index_variable(self):
@@ -26,14 +27,19 @@ class NonOverlappingIndexVariableCase(Te
exe = os.path.join(os.getcwd(), self.exe_name)
self.runCmd("file %s" % exe, CURRENT_EXECUTABLE_SET)
- lldbutil.run_break_set_by_file_and_line (self, self.source, self.line_to_break, num_expected_locations=1, loc_exact=True)
+ lldbutil.run_break_set_by_file_and_line(
+ self,
+ self.source,
+ self.line_to_break,
+ num_expected_locations=1,
+ loc_exact=True)
self.runCmd("run", RUN_SUCCEEDED)
# The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs = ['stopped',
- 'stop reason = breakpoint'])
+ substrs=['stopped',
+ 'stop reason = breakpoint'])
self.runCmd('frame variable i')
self.runCmd('expr i')
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py Tue Sep 6 15:57:50 2016
@@ -4,24 +4,28 @@ Test that using a non-existent architect
from __future__ import print_function
-
import lldb
from lldbsuite.test.lldbtest import *
import lldbsuite.test.lldbutil as lldbutil
+
class NoSuchArchTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
- def test (self):
+ def test(self):
self.build()
- exe = os.path.join (os.getcwd(), "a.out")
-
- # Check that passing an invalid arch via the command-line fails but doesn't crash
- self.expect("target crete --arch nothingtoseehere %s" % (exe), error=True)
+ exe = os.path.join(os.getcwd(), "a.out")
- # Check that passing an invalid arch via the SB API fails but doesn't crash
- target = self.dbg.CreateTargetWithFileAndArch(exe,"nothingtoseehere")
+ # Check that passing an invalid arch via the command-line fails but
+ # doesn't crash
+ self.expect(
+ "target crete --arch nothingtoseehere %s" %
+ (exe), error=True)
+
+ # Check that passing an invalid arch via the SB API fails but doesn't
+ # crash
+ target = self.dbg.CreateTargetWithFileAndArch(exe, "nothingtoseehere")
self.assertFalse(target.IsValid(), "This target should not be valid")
# Now just create the target with the default arch and check it's fine
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py Tue Sep 6 15:57:50 2016
@@ -7,7 +7,6 @@ foreign-architecture object files.
from __future__ import print_function
-
import os.path
import re
@@ -16,6 +15,7 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestImageListMultiArchitecture(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -35,7 +35,11 @@ class TestImageListMultiArchitecture(Tes
}
for image_name in images:
- file_name = os.path.abspath(os.path.join(os.path.dirname(__file__), "bin", image_name))
+ file_name = os.path.abspath(
+ os.path.join(
+ os.path.dirname(__file__),
+ "bin",
+ image_name))
expected_triple_and_arch_regex = images[image_name]
self.runCmd("file {}".format(file_name))
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py Tue Sep 6 15:57:50 2016
@@ -4,7 +4,6 @@ Test some lldb command abbreviations.
from __future__ import print_function
-
import lldb
import os
import time
@@ -12,25 +11,26 @@ from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class TestPaths(TestBase):
mydir = TestBase.compute_mydir(__file__)
@no_debug_info_test
- def test_paths (self):
+ def test_paths(self):
'''Test to make sure no file names are set in the lldb.SBFileSpec objects returned by lldb.SBHostOS.GetLLDBPath() for paths that are directories'''
- dir_path_types = [lldb.ePathTypeLLDBShlibDir,
- lldb.ePathTypeSupportExecutableDir,
- lldb.ePathTypeHeaderDir,
- lldb.ePathTypePythonDir,
- lldb.ePathTypeLLDBSystemPlugins,
- lldb.ePathTypeLLDBUserPlugins,
- lldb.ePathTypeLLDBTempSystemDir]
-
+ dir_path_types = [lldb.ePathTypeLLDBShlibDir,
+ lldb.ePathTypeSupportExecutableDir,
+ lldb.ePathTypeHeaderDir,
+ lldb.ePathTypePythonDir,
+ lldb.ePathTypeLLDBSystemPlugins,
+ lldb.ePathTypeLLDBUserPlugins,
+ lldb.ePathTypeLLDBTempSystemDir]
+
for path_type in dir_path_types:
- f = lldb.SBHostOS.GetLLDBPath(path_type);
+ f = lldb.SBHostOS.GetLLDBPath(path_type)
# No directory path types should have the filename set
- self.assertTrue (f.GetFilename() == None);
+ self.assertTrue(f.GetFilename() is None)
@no_debug_info_test
def test_directory_doesnt_end_with_slash(self):
@@ -41,9 +41,12 @@ class TestPaths(TestBase):
@skipUnlessPlatform(["windows"])
@no_debug_info_test
- def test_windows_double_slash (self):
+ def test_windows_double_slash(self):
'''Test to check the path with double slash is handled correctly '''
# Create a path and see if lldb gets the directory and file right
- fspec = lldb.SBFileSpec("C:\\dummy1\\dummy2//unknown_file", True);
- self.assertEqual(os.path.normpath(fspec.GetDirectory()), os.path.normpath("C:/dummy1/dummy2"));
- self.assertEqual(fspec.GetFilename(), "unknown_file");
+ fspec = lldb.SBFileSpec("C:\\dummy1\\dummy2//unknown_file", True)
+ self.assertEqual(
+ os.path.normpath(
+ fspec.GetDirectory()),
+ os.path.normpath("C:/dummy1/dummy2"))
+ self.assertEqual(fspec.GetFilename(), "unknown_file")
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py Tue Sep 6 15:57:50 2016
@@ -5,13 +5,14 @@ Test some lldb platform commands.
from __future__ import print_function
-
-import os, time
+import os
+import time
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PlatformCommandTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -23,45 +24,58 @@ class PlatformCommandTestCase(TestBase):
@no_debug_info_test
def test_list(self):
self.expect("platform list",
- patterns = ['^Available platforms:'])
+ patterns=['^Available platforms:'])
@no_debug_info_test
def test_process_list(self):
self.expect("platform process list",
- substrs = ['PID', 'TRIPLE', 'NAME'])
+ substrs=['PID', 'TRIPLE', 'NAME'])
@no_debug_info_test
def test_process_info_with_no_arg(self):
"""This is expected to fail and to return a proper error message."""
self.expect("platform process info", error=True,
- substrs = ['one or more process id(s) must be specified'])
+ substrs=['one or more process id(s) must be specified'])
@no_debug_info_test
def test_status(self):
- self.expect("platform status",
- substrs = ['Platform', 'Triple', 'OS Version', 'Kernel', 'Hostname'])
+ self.expect(
+ "platform status",
+ substrs=[
+ 'Platform',
+ 'Triple',
+ 'OS Version',
+ 'Kernel',
+ 'Hostname'])
@no_debug_info_test
def test_shell(self):
""" Test that the platform shell command can invoke ls. """
triple = self.dbg.GetSelectedPlatform().GetTriple()
if re.match(".*-.*-windows", triple):
- self.expect("platform shell dir c:\\", substrs = ["Windows", "Program Files"])
+ self.expect(
+ "platform shell dir c:\\", substrs=[
+ "Windows", "Program Files"])
elif re.match(".*-.*-.*-android", triple):
- self.expect("platform shell ls /", substrs = ["cache", "dev", "system"])
+ self.expect(
+ "platform shell ls /",
+ substrs=[
+ "cache",
+ "dev",
+ "system"])
else:
- self.expect("platform shell ls /", substrs = ["dev", "tmp", "usr"])
+ self.expect("platform shell ls /", substrs=["dev", "tmp", "usr"])
@no_debug_info_test
def test_shell_builtin(self):
""" Test a shell built-in command (echo) """
self.expect("platform shell echo hello lldb",
- substrs = ["hello lldb"])
+ substrs=["hello lldb"])
- #FIXME: re-enable once platform shell -t can specify the desired timeout
+ # FIXME: re-enable once platform shell -t can specify the desired timeout
@no_debug_info_test
def test_shell_timeout(self):
""" Test a shell built-in command (sleep) that times out """
self.skipTest("due to taking too long to complete.")
- self.expect("platform shell sleep 15", error=True,
- substrs = ["error: timed out waiting for shell command to complete"])
+ self.expect("platform shell sleep 15", error=True, substrs=[
+ "error: timed out waiting for shell command to complete"])
Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py?rev=280751&r1=280750&r2=280751&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py Tue Sep 6 15:57:50 2016
@@ -5,20 +5,23 @@ Test that plugins that load commands wor
from __future__ import print_function
-
-import os, time
+import os
+import time
import re
import lldb
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+
class PluginCommandTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@skipIfNoSBHeaders
- @skipIfHostIncompatibleWithRemote # Requires a compatible arch and platform to link against the host's built lldb lib.
+ # Requires a compatible arch and platform to link against the host's built
+ # lldb lib.
+ @skipIfHostIncompatibleWithRemote
@expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
@no_debug_info_test
def test_load_plugin(self):
@@ -37,23 +40,26 @@ class PluginCommandTestCase(TestBase):
retobj = lldb.SBCommandReturnObject()
- retval = debugger.GetCommandInterpreter().HandleCommand("plugin load %s" % plugin_lib_name, retobj)
+ retval = debugger.GetCommandInterpreter().HandleCommand(
+ "plugin load %s" % plugin_lib_name, retobj)
retobj.Clear()
- retval = debugger.GetCommandInterpreter().HandleCommand("plugin_loaded_command child abc def ghi",retobj)
+ retval = debugger.GetCommandInterpreter().HandleCommand(
+ "plugin_loaded_command child abc def ghi", retobj)
if self.TraceOn():
print(retobj.GetOutput())
- self.expect(retobj,substrs = ['abc def ghi'], exe=False)
+ self.expect(retobj, substrs=['abc def ghi'], exe=False)
retobj.Clear()
# check that abbreviations work correctly in plugin commands.
- retval = debugger.GetCommandInterpreter().HandleCommand("plugin_loaded_ ch abc def ghi",retobj)
+ retval = debugger.GetCommandInterpreter().HandleCommand(
+ "plugin_loaded_ ch abc def ghi", retobj)
if self.TraceOn():
print(retobj.GetOutput())
- self.expect(retobj,substrs = ['abc def ghi'], exe=False)
+ self.expect(retobj, substrs=['abc def ghi'], exe=False)
More information about the lldb-commits
mailing list