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

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

[Siva Chandra]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

gdb/ChangeLog:

2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>

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

gdb/testsuite/ChangeLog:

2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>

        PR python/18291
        * gdb.python/py-xmethods.exp: Add tests.

[-- Attachment #2: pr18291_v1.txt --]
[-- Type: text/plain, Size: 1579 bytes --]

diff --git a/gdb/python/lib/gdb/command/xmethods.py b/gdb/python/lib/gdb/command/xmethods.py
index 37ed2c1..0788a81 100644
--- a/gdb/python/lib/gdb/command/xmethods.py
+++ b/gdb/python/lib/gdb/command/xmethods.py
@@ -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:
diff --git a/gdb/testsuite/gdb.python/py-xmethods.exp b/gdb/testsuite/gdb.python/py-xmethods.exp
index a83b14d..f0236c0 100644
--- a/gdb/testsuite/gdb.python/py-xmethods.exp
+++ b/gdb/testsuite/gdb.python/py-xmethods.exp
@@ -149,3 +149,6 @@ 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"

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

[Siva Chandra]

Ping.

On Sun, Apr 26, 2015 at 7:02 AM, Siva Chandra <sivachandra@google.com> wrote:
> gdb/ChangeLog:
>
> 2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>
>
>         PR python/18291
>         * python/lib/gdb/command/xmethods.py (print_xm_info): Fix typo.
>         Print xmethod matcher status.
>
> gdb/testsuite/ChangeLog:
>
> 2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>
>
>         PR python/18291
>         * gdb.python/py-xmethods.exp: Add tests.

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

[Siva Chandra]

On Thu, May 7, 2015 at 9:26 AM, Doug Evans <dje@google.com> wrote:
> Siva Chandra writes:
>  > gdb/ChangeLog:
>  >
>  > 2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>
>  >
>  >         PR python/18291
>  >         * python/lib/gdb/command/xmethods.py (print_xm_info): Fix typo.
>  >         Print xmethod matcher status.
>  >
>  > gdb/testsuite/ChangeLog:
>  >
>  > 2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>
>  >
>  >         PR python/18291
>  >         * gdb.python/py-xmethods.exp: Add tests.
>
> LGTM.
>
> [Thanks for the ping.  Keep 'em coming! :-)]

Thanks for review. I have now committed this as
df2eb078c0a88a44c49de7045a1c163f380a7efc.

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

[Doug Evans]

Siva Chandra writes:
  > gdb/ChangeLog:
  >
  > 2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>
  >
  >         PR python/18291
  >         * python/lib/gdb/command/xmethods.py (print_xm_info): Fix typo.
  >         Print xmethod matcher status.
  >
  > gdb/testsuite/ChangeLog:
  >
  > 2015-04-26  Siva Chandra Reddy  <sivachandra@google.com>
  >
  >         PR python/18291
  >         * gdb.python/py-xmethods.exp: Add tests.

LGTM.

[Thanks for the ping.  Keep 'em coming! :-)]