[v2] gdb/testsuite: add regression test for per-objfile typeprinters
Commit Message
PR python/17136 reported an unhandled exception when using typeprinters
only valid on some objfiles, rather than being a global typeprinter. The
fix was accepted without a regression test, and we've been carrying one
out-of-tree for a while but I think it's worth upstreaming. The code
itself was developed by Jan Kratochvil.
Co-Authored-By: Jan Kratochvil <jkratochvil@azul.com>
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=17136
Reviewed-By: Andrew Burgess <aburgess@redhat.com>
---
gdb/testsuite/gdb.python/py-typeprint.cc | 6 ++++++
gdb/testsuite/gdb.python/py-typeprint.exp | 4 ++++
gdb/testsuite/gdb.python/py-typeprint.py | 25 ++++++++++++++++++++---
3 files changed, 32 insertions(+), 3 deletions(-)
Comments
Ping!
The only thing that changed from v1 to v2 was adding the Co-Authored-By tag
On 27/02/2023 12:12, Bruno Larsen wrote:
> PR python/17136 reported an unhandled exception when using typeprinters
> only valid on some objfiles, rather than being a global typeprinter. The
> fix was accepted without a regression test, and we've been carrying one
> out-of-tree for a while but I think it's worth upstreaming. The code
> itself was developed by Jan Kratochvil.
>
> Co-Authored-By: Jan Kratochvil <jkratochvil@azul.com>
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=17136
> Reviewed-By: Andrew Burgess <aburgess@redhat.com>
> ---
> gdb/testsuite/gdb.python/py-typeprint.cc | 6 ++++++
> gdb/testsuite/gdb.python/py-typeprint.exp | 4 ++++
> gdb/testsuite/gdb.python/py-typeprint.py | 25 ++++++++++++++++++++---
> 3 files changed, 32 insertions(+), 3 deletions(-)
>
> diff --git a/gdb/testsuite/gdb.python/py-typeprint.cc b/gdb/testsuite/gdb.python/py-typeprint.cc
> index ccd2ed02db1..3f274a73498 100644
> --- a/gdb/testsuite/gdb.python/py-typeprint.cc
> +++ b/gdb/testsuite/gdb.python/py-typeprint.cc
> @@ -31,6 +31,12 @@ templ<basic_string> s;
>
> basic_string bs;
>
> +class Other
> +{
> +};
> +
> +Other ovar;
> +
> int main()
> {
> return 0;
> diff --git a/gdb/testsuite/gdb.python/py-typeprint.exp b/gdb/testsuite/gdb.python/py-typeprint.exp
> index 40f7e53847f..778583b9eff 100644
> --- a/gdb/testsuite/gdb.python/py-typeprint.exp
> +++ b/gdb/testsuite/gdb.python/py-typeprint.exp
> @@ -48,3 +48,7 @@ gdb_test_no_output "enable type-printer string"
> gdb_test "whatis bs" "string" "whatis with enabled printer"
>
> gdb_test "whatis s" "templ<string>"
> +
> +gdb_test "info type-printers" "Type printers for \[^\r\n\]*/py-typeprint:\r\n *other\r\n.*" \
> + "info type-printers for other"
> +gdb_test "whatis ovar" "type = Another"
> diff --git a/gdb/testsuite/gdb.python/py-typeprint.py b/gdb/testsuite/gdb.python/py-typeprint.py
> index b5ba243889b..aac42a1a99a 100644
> --- a/gdb/testsuite/gdb.python/py-typeprint.py
> +++ b/gdb/testsuite/gdb.python/py-typeprint.py
> @@ -15,8 +15,7 @@
>
> import gdb
>
> -
> -class Recognizer(object):
> +class StringRecognizer(object):
> def __init__(self):
> self.enabled = True
>
> @@ -32,7 +31,27 @@ class StringTypePrinter(object):
> self.enabled = True
>
> def instantiate(self):
> - return Recognizer()
> + return StringRecognizer()
>
>
> gdb.type_printers.append(StringTypePrinter())
> +
> +class OtherRecognizer(object):
> + def __init__(self):
> + self.enabled = True
> +
> + def recognize(self, type_obj):
> + if type_obj.tag == 'Other':
> + return 'Another'
> + return None
> +
> +class OtherTypePrinter(object):
> + def __init__(self):
> + self.name = 'other'
> + self.enabled = True
> +
> + def instantiate(self):
> + return OtherRecognizer()
> +
> +import gdb.types
> +gdb.types.register_type_printer(gdb.objfiles()[0], OtherTypePrinter())
>>>>> "Bruno" == Bruno Larsen via Gdb-patches <gdb-patches@sourceware.org> writes:
Bruno> Ping!
Bruno> The only thing that changed from v1 to v2 was adding the Co-Authored-By tag
Looks good to me.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
On 13/03/2023 14:28, Tom Tromey wrote:
>>>>>> "Bruno" == Bruno Larsen via Gdb-patches <gdb-patches@sourceware.org> writes:
> Bruno> Ping!
> Bruno> The only thing that changed from v1 to v2 was adding the Co-Authored-By tag
>
> Looks good to me.
>
> Approved-By: Tom Tromey <tom@tromey.com>
>
> Tom
>
thanks, pushed!
@@ -31,6 +31,12 @@ templ<basic_string> s;
basic_string bs;
+class Other
+{
+};
+
+Other ovar;
+
int main()
{
return 0;
@@ -48,3 +48,7 @@ gdb_test_no_output "enable type-printer string"
gdb_test "whatis bs" "string" "whatis with enabled printer"
gdb_test "whatis s" "templ<string>"
+
+gdb_test "info type-printers" "Type printers for \[^\r\n\]*/py-typeprint:\r\n *other\r\n.*" \
+ "info type-printers for other"
+gdb_test "whatis ovar" "type = Another"
@@ -15,8 +15,7 @@
import gdb
-
-class Recognizer(object):
+class StringRecognizer(object):
def __init__(self):
self.enabled = True
@@ -32,7 +31,27 @@ class StringTypePrinter(object):
self.enabled = True
def instantiate(self):
- return Recognizer()
+ return StringRecognizer()
gdb.type_printers.append(StringTypePrinter())
+
+class OtherRecognizer(object):
+ def __init__(self):
+ self.enabled = True
+
+ def recognize(self, type_obj):
+ if type_obj.tag == 'Other':
+ return 'Another'
+ return None
+
+class OtherTypePrinter(object):
+ def __init__(self):
+ self.name = 'other'
+ self.enabled = True
+
+ def instantiate(self):
+ return OtherRecognizer()
+
+import gdb.types
+gdb.types.register_type_printer(gdb.objfiles()[0], OtherTypePrinter())