[PATCH 18/18] gdb/testsuite: fixup common-block.exp for intel compilers

[George, Jini Susan]

[Public]

Thanks for your patches, Nils, Cristian, Abdul, Felix -- these are extremely helpful. I have tried your patches with AMD AOCC flang and these boost up the fortran tests pass rate for flang also hugely.

A very minor suggestion:

gdb.fortran/common-block.exp (lines 62 and 73): it would be great if you could add flang also along with ifx/ifort in the comments.

Thanks,
Jini.


>>-----Original Message-----
>>From: Gdb-patches <gdb-patches-
>>bounces+jigeorge=amd.com@sourceware.org> On Behalf Of Kempke, Nils-
>>Christian via Gdb-patches
>>Sent: Wednesday, May 11, 2022 9:02 PM
>>To: Andrew Burgess <aburgess@redhat.com>; gdb-patches@sourceware.org
>>Subject: RE: [PATCH 18/18] gdb/testsuite: fixup common-block.exp for intel
>>compilers
>>
>>[CAUTION: External Email]
>>
>>> -----Original Message-----
>>> From: Andrew Burgess <aburgess@redhat.com>
>>> Sent: Wednesday, May 11, 2022 3:29 PM
>>> To: Kempke, Nils-Christian <nils-christian.kempke@intel.com>; gdb-
>>> patches@sourceware.org
>>> Cc: JiniSusan.George@amd.com; Kempke, Nils-Christian <nils-
>>> christian.kempke@intel.com>
>>> Subject: Re: [PATCH 18/18] gdb/testsuite: fixup common-block.exp for
>>> intel compilers
>>>
>>> Nils-Christian Kempke <nils-christian.kempke@intel.com> writes:
>>>
>>> > The order in which the variables in info common and info locals are
>>> > displayed is compiler (and dwarf) dependent.  While all symbols
>>> > should be displayed the order is not fixed.
>>> >
>>> > I added a gdb_test_multiple that lets ifx and ifort pass in cases
>>> > where only the order differs.
>>> > ---
>>> >  gdb/testsuite/gdb.fortran/common-block.exp | 38
>>> ++++++++++++++++++++--
>>> >  1 file changed, 35 insertions(+), 3 deletions(-)
>>> >
>>> > diff --git a/gdb/testsuite/gdb.fortran/common-block.exp
>>> b/gdb/testsuite/gdb.fortran/common-block.exp
>>> > index ac39a4a575..fc38b8d772 100644
>>> > --- a/gdb/testsuite/gdb.fortran/common-block.exp
>>> > +++ b/gdb/testsuite/gdb.fortran/common-block.exp
>>> > @@ -54,8 +54,27 @@ gdb_test "whatis fo_o$suffix" "No symbol
>>> \"fo_o$suffix\" in current context."
>>> >  gdb_test "ptype fo_o$suffix" "No symbol \"fo_o$suffix\" in current
>>> context."
>>> >  gdb_test "p fo_o$suffix" "No symbol \"fo_o$suffix\" in current context."
>>> >
>>> > -gdb_test "info locals" "ix_x = 11\r\niy_y = 22\r\niz_z = 33\r\nix =
>>> > 1\r\niy =
>>> 2\r\niz = 3" "info locals out"
>>> > -gdb_test "info common" "Contents of F77 COMMON block
>>> > 'fo_o':\r\nix_x
>>> = 11\r\niy_y = 22\r\niz_z = 33\r\n\r\nContents of F77 COMMON block
>>> 'foo':\r\nix = 1\r\niy = 2\r\niz = 3" "info common out"
>>> > +gdb_test_multiple "info locals" "info locals out" {
>>> > +    # gfortran
>>> > +    -re "ix_x = 11\r\niy_y = 22\r\niz_z = 33\r\nix = 1\r\niy =
>>> > +2\r\niz =
>>> 3.*$gdb_prompt $" {
>>> > +   pass $gdb_test_name
>>> > +    }
>>>
>>> You can use:
>>>
>>>   -re -wrap "ix_x = 11\r\niy_y = 22\r\niz_z = 33\r\nix = 1\r\niy = 2\r\niz = 3" {
>>>     ...
>>>   }
>>>
>>> to avoid having to add the $gdb_prompt in all of these tests.
>>>
>>> Thanks,
>>> Andrew
>>
>>Thanks! That is more convenient indeed.
>>Changed in v2.
>>
>>Nils
>>
>>Intel Deutschland GmbH
>>Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
>>Tel: +49 89 99 8853-0,
>>https://nam11.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.int
>>el.de%2F&data=05%7C01%7CJiniSusan.George%40amd.com%7C386b8a27
>>b41c4c31135e08da3363612b%7C3dd8961fe4884e608e11a82d994e183d%7C0%
>>7C0%7C637878799180300920%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wL
>>jAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C
>>%7C&sdata=iahWHgSrYwg0K1Fb6%2Fm%2B49ZdPwxx%2F9sGZP1oUc09Z7
>>4%3D&reserved=0
>><https://nam11.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.in
>>tel.de%2F&data=05%7C01%7CJiniSusan.George%40amd.com%7C386b8a2
>>7b41c4c31135e08da3363612b%7C3dd8961fe4884e608e11a82d994e183d%7C0
>>%7C0%7C637878799180300920%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4
>>wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C
>>%7C%7C&sdata=iahWHgSrYwg0K1Fb6%2Fm%2B49ZdPwxx%2F9sGZP1oUc
>>09Z74%3D&reserved=0>
>>Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
>>Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich
>>Commercial Register: Amtsgericht Muenchen HRB 186928