[PR python/18291] Fix printing of "disabled" status of xmethod matchers.

gdb/ChangeLog:

	PR python/18291
	* python/lib/gdb/command/xmethods.py (print_xm_info): Fix typo.
	Print xmethod matcher status.

gdb/testsuite/ChangeLog:

	PR python/18291
	* gdb.python/py-xmethods.exp: Add tests.
This commit is contained in:
Siva Chandra 2015-04-25 17:10:30 -07:00
parent 573cc2e57d
commit df2eb078c0
4 changed files with 16 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2015-05-08 Siva Chandra Reddy <sivachandra@google.com>
PR python/18291
* python/lib/gdb/command/xmethods.py (print_xm_info): Fix typo.
Print xmethod matcher status.
2015-05-08 Andreas Arnez <arnez@linux.vnet.ibm.com>
* s390-linux-nat.c (fill_gregset): Avoid relying on the PSWA

View File

@ -117,7 +117,7 @@ def get_method_matchers_in_loci(loci, locus_re, matcher_re):
def print_xm_info(xm_dict, name_re):
"""Print a dictionary of xmethods."""
def get_status_string(method):
def get_status_string(m):
if not m.enabled:
return " [disabled]"
else:
@ -130,7 +130,7 @@ def print_xm_info(xm_dict, name_re):
continue
print ("Xmethods in %s:" % locus_str)
for matcher in xm_dict[locus_str]:
print (" %s" % matcher.name)
print (" %s%s" % (matcher.name, get_status_string(matcher)))
if not matcher.methods:
continue
for m in matcher.methods:

View File

@ -1,3 +1,8 @@
2015-05-08 Siva Chandra Reddy <sivachandra@google.com>
PR python/18291
* gdb.python/py-xmethods.exp: Add tests.
2015-05-08 Yao Qi <yao.qi@linaro.org>
PR gdb/18208

View File

@ -150,6 +150,9 @@ gdb_test_no_output "disable xmethod progspace E_methods;method_int" \
"disable xmethod progspace E_methods;method_int"
gdb_test "info xmethod progspace E_methods;method_int" ".* \\\[disabled\\\]" \
"info xmethod xmethods E_methods;method_int"
gdb_test_no_output "disable xmethod progspace G_methods" "Disable G_methods 2"
gdb_test "info xmethod progspace" ".*G_methods \\\[disabled\\\].*" \
"info xmethod progspace"
# PR 18285
# First make sure both are enabled.