Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Nils-Christian Kempke via Gdb-patches <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Cc: JiniSusan.George@amd.com, aburgess@redhat.com
Subject: [PATCH 10/18] testsuite, fortran: add compiler dependent types to dynamic-ptype-whatis
Date: Tue, 10 May 2022 16:24:29 +0200	[thread overview]
Message-ID: <20220510142437.1397399-11-nils-christian.kempke@intel.com> (raw)
In-Reply-To: <20220510142437.1397399-1-nils-christian.kempke@intel.com>

The test was earlier not using the compiler dependent type print system
in fortran.exp.  I changed this.  It should generally improve the test
performance for different compilers.  For ifx and gfortran I do not see
any failures.
---
 .../gdb.fortran/dynamic-ptype-whatis.exp      | 79 ++++++++++---------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp b/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
index 7367b1d46b..f0463f4f62 100644
--- a/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
+++ b/gdb/testsuite/gdb.fortran/dynamic-ptype-whatis.exp
@@ -34,62 +34,65 @@ if {![fortran_runto_main]} {
 gdb_breakpoint [gdb_get_line_number "Break Here"]
 gdb_continue_to_breakpoint "Break Here"
 
-gdb_test "whatis var1" "type = real\\(kind=4\\) \\(3\\)"
-gdb_test "whatis var2" "type = real\\(kind=4\\), allocatable \\(4\\)"
+set real4 [fortran_real4]
+set int4 [fortran_int4]
+
+gdb_test "whatis var1" "type = ${real4} \\(3\\)"
+gdb_test "whatis var2" "type = ${real4}, allocatable \\(4\\)"
 gdb_test "whatis var3" "type = Type type1"
 gdb_test "whatis var4" "type = Type type2"
 gdb_test "whatis var5" "type = Type type3"
 gdb_test "whatis var6" "type = Type type4"
 gdb_test "whatis var7" "type = Type type5"
-gdb_test "ptype var1" "type = real\\(kind=4\\) \\(3\\)"
-gdb_test "ptype var2" "type = real\\(kind=4\\), allocatable \\(4\\)"
+gdb_test "ptype var1" "type = ${real4} \\(3\\)"
+gdb_test "ptype var2" "type = ${real4}, allocatable \\(4\\)"
 gdb_test "ptype var3" \
     [ multi_line "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1" ]
 gdb_test "ptype var4" \
     [multi_line "type = Type type2" \
-	 "    integer\\(kind=4\\) :: spacer" \
+	 "    ${int4} :: spacer" \
 	 "    Type type1, allocatable :: t2_array\\(3\\)" \
 	 "End Type type2"]
 gdb_test "ptype var5" \
     [ multi_line "type = Type type3" \
-	  "    integer\\(kind=4\\) :: spacer" \
+	  "    ${int4} :: spacer" \
 	  "    Type type1 :: t3_array\\(3\\)"\
 	  "End Type type3" ]
 gdb_test "ptype var6" \
     [ multi_line "type = Type type4" \
-	  "    integer\\(kind=4\\) :: spacer" \
+	  "    ${int4} :: spacer" \
 	  "    Type type2, allocatable :: t4_array\\(3\\)" \
 	  "End Type type4" ]
 gdb_test "ptype var7" \
     [ multi_line "type = Type type5" \
-	  "    integer\\(kind=4\\) :: spacer" \
+	  "    ${int4} :: spacer" \
 	  "    Type type2 :: t5_array\\(4\\)" \
 	  "End Type type5" ]
-gdb_test "whatis var3%t1_i" "type = integer\\(kind=4\\)"
+gdb_test "whatis var3%t1_i" "type = ${int4}"
 gdb_test "whatis var4%t2_array" "type = Type type1, allocatable \\(3\\)"
 gdb_test "whatis var5%t3_array" "type = Type type1 \\(3\\)"
 gdb_test "whatis var6%t4_array" "type = Type type2, allocatable \\(3\\)"
 gdb_test "whatis var7%t5_array" "type = Type type2 \\(4\\)"
-gdb_test "ptype var3%t1_i" "type = integer\\(kind=4\\)"
+gdb_test "ptype var3%t1_i" "type = ${int4}"
 gdb_test "ptype var4%t2_array" [ multi_line "type = Type type1" \
-				     "    integer\\(kind=4\\) :: spacer" \
-				     "    integer\\(kind=4\\) :: t1_i" \
+				     "    ${int4} :: spacer" \
+				     "    ${int4} :: t1_i" \
 				     "End Type type1, allocatable \\(3\\)" ]
 gdb_test "ptype var5%t3_array" [ multi_line "type = Type type1" \
-				     "    integer\\(kind=4\\) :: spacer" \
-				     "    integer\\(kind=4\\) :: t1_i" \
+				     "    ${int4} :: spacer" \
+				     "    ${int4} :: t1_i" \
 				     "End Type type1 \\(3\\)" ]
 gdb_test "ptype var6%t4_array" \
     [ multi_line "type = Type type2" \
-	  "    integer\\(kind=4\\) :: spacer" \
+	  "    ${int4} :: spacer" \
 	  "    Type type1, allocatable :: t2_array\\(:\\)" \
 	  "End Type type2, allocatable \\(3\\)" ]
 gdb_test "ptype var7%t5_array" \
     [ multi_line "type = Type type2" \
-	  "    integer\\(kind=4\\) :: spacer" \
+	  "    ${int4} :: spacer" \
 	  "    Type type1, allocatable :: t2_array\\(:\\)" \
 	  "End Type type2 \\(4\\)" ]
 gdb_test "whatis var4%t2_array(1)" "type = Type type1"
@@ -98,41 +101,41 @@ gdb_test "whatis var6%t4_array(1)" "type = Type type2"
 gdb_test "whatis var7%t5_array(1)" "type = Type type2"
 gdb_test "ptype var4%t2_array(1)" \
     [ multi_line "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1" ]
 gdb_test "ptype var5%t3_array(1)" \
     [ multi_line "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1" ]
 gdb_test "ptype var6%t4_array(1)" \
     [ multi_line "type = Type type2" \
-	  "    integer\\(kind=4\\) :: spacer" \
+	  "    ${int4} :: spacer" \
 	  "    Type type1, allocatable :: t2_array\\(2\\)" \
 	  "End Type type2" ]
 gdb_test "ptype var7%t5_array(1)" \
     [ multi_line "type = Type type2" \
-	  "    integer\\(kind=4\\) :: spacer" \
+	  "    ${int4} :: spacer" \
 	  "    Type type1, allocatable :: t2_array\\(2\\)" \
 	  "End Type type2" ]
-gdb_test "whatis var4%t2_array(1)%t1_i" "type = integer\\(kind=4\\)"
-gdb_test "whatis var5%t3_array(1)%t1_i" "type = integer\\(kind=4\\)"
+gdb_test "whatis var4%t2_array(1)%t1_i" "type = ${int4}"
+gdb_test "whatis var5%t3_array(1)%t1_i" "type = ${int4}"
 gdb_test "whatis var6%t4_array(1)%t2_array" \
     "type = Type type1, allocatable \\(2\\)"
 gdb_test "whatis var7%t5_array(1)%t2_array" \
     "type = Type type1, allocatable \\(2\\)"
-gdb_test "ptype var4%t2_array(1)%t1_i" "type = integer\\(kind=4\\)"
-gdb_test "ptype var5%t3_array(1)%t1_i" "type = integer\\(kind=4\\)"
+gdb_test "ptype var4%t2_array(1)%t1_i" "type = ${int4}"
+gdb_test "ptype var5%t3_array(1)%t1_i" "type = ${int4}"
 gdb_test "ptype var6%t4_array(1)%t2_array" \
     [ multi_line "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1, allocatable \\(2\\)" ]
 gdb_test "ptype var7%t5_array(1)%t2_array" \
     [ multi_line "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1, allocatable \\(2\\)" ]
 gdb_test "whatis var6%t4_array(1)%t2_array(1)" \
     "type = Type type1"
@@ -141,18 +144,18 @@ gdb_test "whatis var7%t5_array(1)%t2_array(1)" \
 gdb_test "ptype var6%t4_array(1)%t2_array(1)" \
     [ multi_line \
 	  "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1" ]
 gdb_test "ptype var7%t5_array(1)%t2_array(1)" \
     [ multi_line \
 	  "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1" ]
 gdb_test "ptype var8%ptr_1%t2_array" \
     [ multi_line \
 	  "type = Type type1" \
-	  "    integer\\(kind=4\\) :: spacer" \
-	  "    integer\\(kind=4\\) :: t1_i" \
+	  "    ${int4} :: spacer" \
+	  "    ${int4} :: t1_i" \
 	  "End Type type1, allocatable \\(3\\)" ]
-- 
2.25.1

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


  parent reply	other threads:[~2022-05-10 14:30 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-10 14:24 [PATCH 00/18] Fortran compiler identification and ifx testsuite support Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 01/18] gdb/testsuite: remove F77_FOR_TARGET support Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 02/18] gdb/testsuite: Use -module option for Intel Fortran compilers Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 03/18] gdb/testsuite: Fix fortran types for Intel compilers Nils-Christian Kempke via Gdb-patches
2022-05-11  9:49   ` Andrew Burgess via Gdb-patches
2022-05-11  9:57     ` Kempke, Nils-Christian via Gdb-patches
2022-05-10 14:24 ` [PATCH 04/18] gdb/testsuite: add local variable for passing 'getting_compiler_info' to gdb_compile Nils-Christian Kempke via Gdb-patches
2022-05-11 10:10   ` Andrew Burgess via Gdb-patches
2022-05-11 14:24     ` Kempke, Nils-Christian via Gdb-patches
2022-05-10 14:24 ` [PATCH 05/18] gdb/testsuite: add Fortran compiler identification to GDB Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 06/18] gdb/testsuite: rename intel next gen c/cpp compilers Nils-Christian Kempke via Gdb-patches
2022-05-11 11:23   ` Andrew Burgess via Gdb-patches
2022-05-11 14:28     ` Kempke, Nils-Christian via Gdb-patches
2022-05-10 14:24 ` [PATCH 07/18] gdb/testsuite: disable charset.exp for intel compilers Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 08/18] testsuite, fortran: make print-formatted.exp more robust Nils-Christian Kempke via Gdb-patches
2022-05-11 11:32   ` Andrew Burgess via Gdb-patches
2022-05-11 14:32     ` Kempke, Nils-Christian via Gdb-patches
2022-05-10 14:24 ` [PATCH 09/18] testsuite, fortran: add required external keyword Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` Nils-Christian Kempke via Gdb-patches [this message]
2022-05-10 14:24 ` [PATCH 11/18] testsuite, fortran: Add '-debug-parameters all' when compiling with ifx Nils-Christian Kempke via Gdb-patches
2022-05-11 11:56   ` Andrew Burgess via Gdb-patches
2022-05-11 14:36     ` Kempke, Nils-Christian via Gdb-patches
2022-05-10 14:24 ` [PATCH 12/18] testsuite/lib: add check_optional_entry for GDBInfoSymbols Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 13/18] testsuite, fortran: fix info-types for intel compilers Nils-Christian Kempke via Gdb-patches
2022-05-11 12:06   ` Andrew Burgess via Gdb-patches
2022-05-11 15:20     ` Kempke, Nils-Christian via Gdb-patches
2022-05-11 16:43       ` Kempke, Nils-Christian via Gdb-patches
2022-05-30 10:33         ` Andrew Burgess via Gdb-patches
2022-05-30 10:32       ` Andrew Burgess via Gdb-patches
2022-05-10 14:24 ` [PATCH 14/18] testsuite, fortran: Add type info of formal parameter for Intel compilers Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 15/18] testsuite, fortran: allow additional completions in module.exp Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 16/18] gdb, testsuite, fortran: fix double free in mixed-lang-stack.exp Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 17/18] gdb, testsuite, fortran: fixup mixed-lang-stack for Intel/LLVM compilers Nils-Christian Kempke via Gdb-patches
2022-05-10 14:24 ` [PATCH 18/18] gdb/testsuite: fixup common-block.exp for intel compilers Nils-Christian Kempke via Gdb-patches
2022-05-11 13:29   ` Andrew Burgess via Gdb-patches
2022-05-11 15:31     ` Kempke, Nils-Christian via Gdb-patches
2022-05-16  6:36       ` George, Jini Susan via Gdb-patches
2022-05-16  7:59         ` Kempke, Nils-Christian via Gdb-patches
2022-05-11 13:32 ` [PATCH 00/18] Fortran compiler identification and ifx testsuite support Andrew Burgess via Gdb-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220510142437.1397399-11-nils-christian.kempke@intel.com \
    --to=gdb-patches@sourceware.org \
    --cc=JiniSusan.George@amd.com \
    --cc=aburgess@redhat.com \
    --cc=nils-christian.kempke@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox