Some libcs' snprintf may output a leading minus sign when %p-formatting
(should fix a failure on the OpenIndiana AMD64 buildbot)
This commit is contained in:
parent
c366117820
commit
4d098735c6
@ -315,7 +315,7 @@ class Foo:
|
||||
foo = Foo()
|
||||
foo.an_int = 42
|
||||
id(foo)''')
|
||||
m = re.match(r'<Foo\(an_int=42\) at remote 0x[0-9a-f]+>', gdb_repr)
|
||||
m = re.match(r'<Foo\(an_int=42\) at remote 0x-?[0-9a-f]+>', gdb_repr)
|
||||
self.assertTrue(m,
|
||||
msg='Unexpected new-style class rendering %r' % gdb_repr)
|
||||
|
||||
@ -328,7 +328,7 @@ foo = Foo()
|
||||
foo += [1, 2, 3]
|
||||
foo.an_int = 42
|
||||
id(foo)''')
|
||||
m = re.match(r'<Foo\(an_int=42\) at remote 0x[0-9a-f]+>', gdb_repr)
|
||||
m = re.match(r'<Foo\(an_int=42\) at remote 0x-?[0-9a-f]+>', gdb_repr)
|
||||
|
||||
self.assertTrue(m,
|
||||
msg='Unexpected new-style class rendering %r' % gdb_repr)
|
||||
@ -343,7 +343,7 @@ class Foo(tuple):
|
||||
foo = Foo((1, 2, 3))
|
||||
foo.an_int = 42
|
||||
id(foo)''')
|
||||
m = re.match(r'<Foo\(an_int=42\) at remote 0x[0-9a-f]+>', gdb_repr)
|
||||
m = re.match(r'<Foo\(an_int=42\) at remote 0x-?[0-9a-f]+>', gdb_repr)
|
||||
|
||||
self.assertTrue(m,
|
||||
msg='Unexpected new-style class rendering %r' % gdb_repr)
|
||||
@ -370,7 +370,7 @@ id(foo)''')
|
||||
|
||||
# Match anything for the type name; 0xDEADBEEF could point to
|
||||
# something arbitrary (see http://bugs.python.org/issue8330)
|
||||
pattern = '<.* at remote 0x[0-9a-f]+>'
|
||||
pattern = '<.* at remote 0x-?[0-9a-f]+>'
|
||||
|
||||
m = re.match(pattern, gdb_repr)
|
||||
if not m:
|
||||
@ -416,7 +416,7 @@ id(foo)''')
|
||||
# http://bugs.python.org/issue8032#msg100537 )
|
||||
gdb_repr, gdb_output = self.get_gdb_repr('id(__builtins__.help)', import_site=True)
|
||||
|
||||
m = re.match(r'<_Helper at remote 0x[0-9a-f]+>', gdb_repr)
|
||||
m = re.match(r'<_Helper at remote 0x-?[0-9a-f]+>', gdb_repr)
|
||||
self.assertTrue(m,
|
||||
msg='Unexpected rendering %r' % gdb_repr)
|
||||
|
||||
@ -447,7 +447,7 @@ class Foo:
|
||||
foo = Foo()
|
||||
foo.an_attr = foo
|
||||
id(foo)''')
|
||||
self.assertTrue(re.match('<Foo\(an_attr=<\.\.\.>\) at remote 0x[0-9a-f]+>',
|
||||
self.assertTrue(re.match('<Foo\(an_attr=<\.\.\.>\) at remote 0x-?[0-9a-f]+>',
|
||||
gdb_repr),
|
||||
'Unexpected gdb representation: %r\n%s' % \
|
||||
(gdb_repr, gdb_output))
|
||||
@ -460,7 +460,7 @@ class Foo(object):
|
||||
foo = Foo()
|
||||
foo.an_attr = foo
|
||||
id(foo)''')
|
||||
self.assertTrue(re.match('<Foo\(an_attr=<\.\.\.>\) at remote 0x[0-9a-f]+>',
|
||||
self.assertTrue(re.match('<Foo\(an_attr=<\.\.\.>\) at remote 0x-?[0-9a-f]+>',
|
||||
gdb_repr),
|
||||
'Unexpected gdb representation: %r\n%s' % \
|
||||
(gdb_repr, gdb_output))
|
||||
@ -474,7 +474,7 @@ b = Foo()
|
||||
a.an_attr = b
|
||||
b.an_attr = a
|
||||
id(a)''')
|
||||
self.assertTrue(re.match('<Foo\(an_attr=<Foo\(an_attr=<\.\.\.>\) at remote 0x[0-9a-f]+>\) at remote 0x[0-9a-f]+>',
|
||||
self.assertTrue(re.match('<Foo\(an_attr=<Foo\(an_attr=<\.\.\.>\) at remote 0x-?[0-9a-f]+>\) at remote 0x-?[0-9a-f]+>',
|
||||
gdb_repr),
|
||||
'Unexpected gdb representation: %r\n%s' % \
|
||||
(gdb_repr, gdb_output))
|
||||
@ -509,7 +509,7 @@ id(a)''')
|
||||
|
||||
def test_builtin_method(self):
|
||||
gdb_repr, gdb_output = self.get_gdb_repr('import sys; id(sys.stdout.readlines)')
|
||||
self.assertTrue(re.match('<built-in method readlines of _io.TextIOWrapper object at remote 0x[0-9a-f]+>',
|
||||
self.assertTrue(re.match('<built-in method readlines of _io.TextIOWrapper object at remote 0x-?[0-9a-f]+>',
|
||||
gdb_repr),
|
||||
'Unexpected gdb representation: %r\n%s' % \
|
||||
(gdb_repr, gdb_output))
|
||||
@ -524,7 +524,7 @@ id(foo.__code__)''',
|
||||
breakpoint='builtin_id',
|
||||
cmds_after_breakpoint=['print (PyFrameObject*)(((PyCodeObject*)v)->co_zombieframe)']
|
||||
)
|
||||
self.assertTrue(re.match('.*\s+\$1 =\s+Frame 0x[0-9a-f]+, for file <string>, line 3, in foo \(\)\s+.*',
|
||||
self.assertTrue(re.match('.*\s+\$1 =\s+Frame 0x-?[0-9a-f]+, for file <string>, line 3, in foo \(\)\s+.*',
|
||||
gdb_output,
|
||||
re.DOTALL),
|
||||
'Unexpected gdb representation: %r\n%s' % (gdb_output, gdb_output))
|
||||
@ -577,7 +577,7 @@ class StackNavigationTests(DebuggerTests):
|
||||
cmds_after_breakpoint=['py-up'])
|
||||
self.assertMultilineMatches(bt,
|
||||
r'''^.*
|
||||
#[0-9]+ Frame 0x[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
|
||||
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
|
||||
baz\(a, b, c\)
|
||||
$''')
|
||||
|
||||
@ -604,9 +604,9 @@ $''')
|
||||
cmds_after_breakpoint=['py-up', 'py-down'])
|
||||
self.assertMultilineMatches(bt,
|
||||
r'''^.*
|
||||
#[0-9]+ Frame 0x[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
|
||||
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
|
||||
baz\(a, b, c\)
|
||||
#[0-9]+ Frame 0x[0-9a-f]+, for file .*gdb_sample.py, line 10, in baz \(args=\(1, 2, 3\)\)
|
||||
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 10, in baz \(args=\(1, 2, 3\)\)
|
||||
id\(42\)
|
||||
$''')
|
||||
|
||||
@ -634,11 +634,11 @@ Traceback \(most recent call first\):
|
||||
cmds_after_breakpoint=['py-bt-full'])
|
||||
self.assertMultilineMatches(bt,
|
||||
r'''^.*
|
||||
#[0-9]+ Frame 0x[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
|
||||
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 7, in bar \(a=1, b=2, c=3\)
|
||||
baz\(a, b, c\)
|
||||
#[0-9]+ Frame 0x[0-9a-f]+, for file .*gdb_sample.py, line 4, in foo \(a=1, b=2, c=3\)
|
||||
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 4, in foo \(a=1, b=2, c=3\)
|
||||
bar\(a, b, c\)
|
||||
#[0-9]+ Frame 0x[0-9a-f]+, for file .*gdb_sample.py, line 12, in <module> \(\)
|
||||
#[0-9]+ Frame 0x-?[0-9a-f]+, for file .*gdb_sample.py, line 12, in <module> \(\)
|
||||
foo\(1, 2, 3\)
|
||||
''')
|
||||
|
||||
@ -667,7 +667,7 @@ class PyPrintTests(DebuggerTests):
|
||||
bt = self.get_stack_trace(script=self.get_sample_script(),
|
||||
cmds_after_breakpoint=['py-print len'])
|
||||
self.assertMultilineMatches(bt,
|
||||
r".*\nbuiltin 'len' = <built-in method len of module object at remote 0x[0-9a-f]+>\n.*")
|
||||
r".*\nbuiltin 'len' = <built-in method len of module object at remote 0x-?[0-9a-f]+>\n.*")
|
||||
|
||||
class PyLocalsTests(DebuggerTests):
|
||||
def test_basic_command(self):
|
||||
|
Loading…
x
Reference in New Issue
Block a user