RE: [PING**3] [PATCH] gdb, testsuite: Fix mi-var-child-f.exp for Intel compilers.

Willgerodt, Felix via Gdb-patches
2021-06-11T15:22:15Z

That must have been my outlook when hitting reply, the patch already follows the 80 char limit. Sorry for that.

Thanks, I pushed it!

Regards,
Felix

>
> GDB however uses DW_AT_name mostly in its output, which fails the regex.
> To fix this testcase immediately, I modernized array.f and gave it a named main. There was no specific reason it was unnamed anyway. Fixing the testsuite properly is not straightforward. fortran_main and test_compiler_info would need some changes, which has broader influences.
> I might look at this later down the road.

You should try to keep lines < 80 characters in the commit message.

Otherwise, LGTM.

Thanks,
Andrew

>
> gdb/testsuite/ChangeLog:
> 2021-05-06 Felix Willgerodt <felix.willgerodt@intel.com>
>
> * gdb.mi/array.f: Convert into...
> * gdb.mi/array.f90: ...this.
> * gdb.mi/mi-var-child-f.exp: Use array.f90.
> ---
> gdb/testsuite/gdb.mi/array.f | 20 --------------------
> gdb/testsuite/gdb.mi/array.f90 | 21 +++++++++++++++++++++
> gdb/testsuite/gdb.mi/mi-var-child-f.exp | 4 ++--
> 3 files changed, 23 insertions(+), 22 deletions(-) delete mode
> 100644 gdb/testsuite/gdb.mi/array.f create mode 100644
> gdb/testsuite/gdb.mi/array.f90
>
> diff --git a/gdb/testsuite/gdb.mi/array.f
> b/gdb/testsuite/gdb.mi/array.f deleted file mode 100644 index
> 2d31ecae984..00000000000
> --- a/gdb/testsuite/gdb.mi/array.f
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -c Copyright 2006-2021 Free Software Foundation, Inc.
> -
> -c This program is free software; you can redistribute it and/or modify -c it under the terms of the GNU General Public License as published by -c the Free Software Foundation; either version 3 of the License, or -c (at your option) any later version.
> -c
> -c This program is distributed in the hope that it will be useful, -c but WITHOUT ANY WARRANTY; without even the implied warranty of -c MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -c GNU General Public License for more details.
> -c
> -c You should have received a copy of the GNU General Public License -c along with this program. If not, see <http://www.gnu.org/licenses/>.
> -
> - INTEGER array(1:2,-1:1)
> - DATA array/11,21,12,22,13,23/
> - CONTINUE
> - STOP
> - END
> diff --git a/gdb/testsuite/gdb.mi/array.f90
> b/gdb/testsuite/gdb.mi/array.f90 new file mode 100644 index
> 00000000000..b414b27e026
> --- /dev/null
> +++ b/gdb/testsuite/gdb.mi/array.f90
> @@ -0,0 +1,21 @@
> +! Copyright 2006-2021 Free Software Foundation, Inc.
> +
> +! This program is free software; you can redistribute it and/or
> +modify ! it under the terms of the GNU General Public License as
> +published by ! the Free Software Foundation; either version 3 of the License, or !
> +(at your option) any later version.
> +!
> +! This program is distributed in the hope that it will be useful, !
> +but WITHOUT ANY WARRANTY; without even the implied warranty of !
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! GNU
> +General Public License for more details.
> +!
> +! You should have received a copy of the GNU General Public License !
> +along with this program. If not, see <http://www.gnu.org/licenses/>.
> +
> +program prog_array
> + INTEGER array (1:2,-1:1)
> + DATA array/11,21,12,22,13,23/
> + CONTINUE
> + STOP
> +end program prog_array
> diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp
> b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
> index 272505a4d69..f35c0cdd6d3 100644
> --- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp
> +++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
> @@ -26,7 +26,7 @@ if [mi_gdb_start] {
> continue
> }
>
> -standard_testfile array.f
> +standard_testfile array.f90
>
> if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
> executable {debug f90}] != ""} {
> @@ -36,7 +36,7 @@ if {[gdb_compile "${srcdir}/${subdir}/${srcfile}"
> "${binfile}" \ mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load
> ${binfile}
>
> -mi_runto [fortran_main]
> +mi_runto prog_array
>
> mi_create_varobj "array" "array" "create local variable array"
>
> --
> 2.25.4
>
> Intel Deutschland GmbH
> Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
> Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de> 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
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
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