Re: [PATCH] Do not record a rejected target description

[Andrew Burgess <aburgess@redhat.com>]

Tom Tromey <tromey@adacore.com> writes:

> Simon> I see:
>
> Simon>   maint print c-tdesc^M
> Simon>   There is no target description to print.^M
> Simon>   (gdb) FAIL: gdb.xml/maint_print_struct.exp: printing tdesc with a structure and a bitfield
>
> Here's a patch that avoids this problem.
> Let me know what you think.
>
> Tom
>
> commit a12897d22ccc1d927960fa411b99723d76620af0
> Author: Tom Tromey <tromey@adacore.com>
> Date:   Thu Feb 16 12:17:50 2023 -0700
>
>     Fix regression in maint_print_struct.exp
>     
>     An earlier patch of mine caused a regression in
>     maint_print_struct.exp.  This patch fixes it by modifying the test so
>     that it does not rely on the erroneous target description being
>     available.
>
> diff --git a/gdb/testsuite/gdb.xml/maint_print_struct.exp b/gdb/testsuite/gdb.xml/maint_print_struct.exp
> index 6f411895501..5b7c1489d3e 100644
> --- a/gdb/testsuite/gdb.xml/maint_print_struct.exp
> +++ b/gdb/testsuite/gdb.xml/maint_print_struct.exp
> @@ -21,12 +21,7 @@ require allow_xml_test
>  
>  gdb_start
>  
> -# Required registers are not present so it is expected a warning.
> -#
> -gdb_test "set tdesc filename $srcdir/$subdir/maint_print_struct.xml" "
> -warning:.*" "setting a new tdesc having only a structure"

Haven't you just deleted a test for a warning here?

> -
> -gdb_test "maint print c-tdesc" "

This test (without the filename) actually tests for the change in your
original patch - if we just update the expected output...

> +gdb_test "maint print c-tdesc $srcdir/$subdir/maint_print_struct.xml" "

This should probably be as well as retaining the above tests.

I'd propose the patch below.

thanks,
Andrew


>  .*tdesc_create_reg \\(feature, \"bad_reg1\", \[0-9\]+, 1, NULL, 128, \"two_fielded\"\\);\r
>  .*tdesc_create_reg \\(feature, \"bad_reg2\", \[0-9\]+, 1, NULL, 64, \"bitfield\"\\);\r
>  .*" "printing tdesc with a structure and a bitfield"


---

commit 416465d0331d3347bebf4c72c544d7d3ecb926e7
Author: Andrew Burgess <aburgess@redhat.com>
Date:   Fri Feb 17 10:15:27 2023 +0000

    gdb: fix regression in gdb.xml/maint_print_struct.exp
    
    A regression in gdb.xml/maint_print_struct.exp was introduced with
    commit:
    
      commit 81b86eced24f905545b58aa6c27478104c364976
      Date:   Fri Jan 6 09:30:40 2023 -0700
    
          Do not record a rejected target description
    
    The test relied on an invalid target description being stored within
    the tdesc_info of the current inferior, the above commit stopped this
    behaviour.
    
    Update the test to check that the invalid architecture is NOT stored,
    and then check printing the target description directly from the
    file.

diff --git a/gdb/testsuite/gdb.xml/maint_print_struct.exp b/gdb/testsuite/gdb.xml/maint_print_struct.exp
index 6f411895501..fbb16aeb8f5 100644
--- a/gdb/testsuite/gdb.xml/maint_print_struct.exp
+++ b/gdb/testsuite/gdb.xml/maint_print_struct.exp
@@ -21,12 +21,17 @@ require allow_xml_test
 
 gdb_start
 
+set xml_file "$srcdir/$subdir/maint_print_struct.xml"
+
 # Required registers are not present so it is expected a warning.
 #
-gdb_test "set tdesc filename $srcdir/$subdir/maint_print_struct.xml" "
+gdb_test "set tdesc filename $xml_file" "
 warning:.*" "setting a new tdesc having only a structure"
 
-gdb_test "maint print c-tdesc" "
+gdb_test "maint print c-tdesc" \
+    "There is no target description to print\\."
+
+gdb_test "maint print c-tdesc $xml_file" "
 .*tdesc_create_reg \\(feature, \"bad_reg1\", \[0-9\]+, 1, NULL, 128, \"two_fielded\"\\);\r
 .*tdesc_create_reg \\(feature, \"bad_reg2\", \[0-9\]+, 1, NULL, 64, \"bitfield\"\\);\r
 .*" "printing tdesc with a structure and a bitfield"