[PATCH] gdb, testsuite: fix gdb.base/save-history.exp for native-extended-gdbserver

[PATCH] gdb, testsuite: fix gdb.base/save-history.exp for native-extended-gdbserver

[Tankut Baris Aktemur]

When executed with the native-extended-gdbserver board file, we get

  FAIL: gdb.base/save-history.exp: check history contents

This is because the history file contains an extra line for the
command 'target extended-remote ...'.  To keep the test
straightforward, skip it if using the extended-remote target.
---
 gdb/testsuite/gdb.base/save-history.exp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gdb/testsuite/gdb.base/save-history.exp b/gdb/testsuite/gdb.base/save-history.exp
index bb7a56b2a72..5ca47f3bc1f 100644
--- a/gdb/testsuite/gdb.base/save-history.exp
+++ b/gdb/testsuite/gdb.base/save-history.exp
@@ -19,6 +19,13 @@
 
 require {!is_remote host}
 
+# A remote server adds extra setup commands in history.  To keep the
+# test straighforward, skip extended-remote target.
+if {[target_info gdb_protocol] == "extended-remote"} {
+    unsupported "test not aimed for extended-remote target"
+    return
+}
+
 gdb_start
 
 # Get something in history.
-- 
2.34.1

Intel Deutschland GmbH
Registered Address: Dornacher Strasse 1, 85622 Feldkirchen, Germany
Tel: +49 89 991 430, www.intel.de
Managing Directors: Harry Demas, Jeffrey Schneiderman, Yin Chong Sorrell
Chairperson of the Supervisory Board: Nicole Lau
Registered Seat: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928

Re: [PATCH] gdb, testsuite: fix gdb.base/save-history.exp for native-extended-gdbserver

[Guinevere Larsen]

On 4/17/26 7:35 AM, Tankut Baris Aktemur wrote:
> When executed with the native-extended-gdbserver board file, we get
>
>    FAIL: gdb.base/save-history.exp: check history contents
>
> This is because the history file contains an extra line for the
> command 'target extended-remote ...'.  To keep the test
> straightforward, skip it if using the extended-remote target.
> ---
>   gdb/testsuite/gdb.base/save-history.exp | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/gdb/testsuite/gdb.base/save-history.exp b/gdb/testsuite/gdb.base/save-history.exp
> index bb7a56b2a72..5ca47f3bc1f 100644
> --- a/gdb/testsuite/gdb.base/save-history.exp
> +++ b/gdb/testsuite/gdb.base/save-history.exp
> @@ -19,6 +19,13 @@
>   
>   require {!is_remote host}
>   
> +# A remote server adds extra setup commands in history.  To keep the
> +# test straighforward, skip extended-remote target.
> +if {[target_info gdb_protocol] == "extended-remote"} {
> +    unsupported "test not aimed for extended-remote target"
> +    return
> +}
> +
>   gdb_start
>   
>   # Get something in history.

I feel like the test would be equally straight forward to make the 
following change instead (comment omitted because I was lazy in local 
testing):

--- a/gdb/testsuite/gdb.base/save-history.exp
+++ b/gdb/testsuite/gdb.base/save-history.exp
@@ -30,6 +30,9 @@ gdb_test_no_output "save history $filename" \

  set expected "set height 0\n"
  append expected "set width 0\n"
+if {[target_info gdb_protocol] == "extended-remote"} {
+    append expected "target extended-remote localhost:2345\n"
+}
  append expected "print 23\n"
  append expected "save history $filename\n"

-- 
Cheers,
Guinevere Larsen
It/she

RE: [PATCH] gdb, testsuite: fix gdb.base/save-history.exp for native-extended-gdbserver

[Aktemur, Tankut Baris]

On Friday, April 17, 2026 2:54 PM, Guinevere Larsen wrote:
> On 4/17/26 7:35 AM, Tankut Baris Aktemur wrote:
> > When executed with the native-extended-gdbserver board file, we get
> >
> >    FAIL: gdb.base/save-history.exp: check history contents
> >
> > This is because the history file contains an extra line for the
> > command 'target extended-remote ...'.  To keep the test
> > straightforward, skip it if using the extended-remote target.
> > ---
> >   gdb/testsuite/gdb.base/save-history.exp | 7 +++++++
> >   1 file changed, 7 insertions(+)
> >
> > diff --git a/gdb/testsuite/gdb.base/save-history.exp
> b/gdb/testsuite/gdb.base/save-history.exp
> > index bb7a56b2a72..5ca47f3bc1f 100644
> > --- a/gdb/testsuite/gdb.base/save-history.exp
> > +++ b/gdb/testsuite/gdb.base/save-history.exp
> > @@ -19,6 +19,13 @@
> >
> >   require {!is_remote host}
> >
> > +# A remote server adds extra setup commands in history.  To keep the
> > +# test straighforward, skip extended-remote target.
> > +if {[target_info gdb_protocol] == "extended-remote"} {
> > +    unsupported "test not aimed for extended-remote target"
> > +    return
> > +}
> > +
> >   gdb_start
> >
> >   # Get something in history.
> 
> I feel like the test would be equally straight forward to make the
> following change instead (comment omitted because I was lazy in local
> testing):
> 
> --- a/gdb/testsuite/gdb.base/save-history.exp
> +++ b/gdb/testsuite/gdb.base/save-history.exp
> @@ -30,6 +30,9 @@ gdb_test_no_output "save history $filename" \
> 
>   set expected "set height 0\n"
>   append expected "set width 0\n"
> +if {[target_info gdb_protocol] == "extended-remote"} {
> +    append expected "target extended-remote localhost:2345\n"

We cannot hardcode the port number but it should be possible to use
$gdbserver_gdbport.  I'll run a parallel make-check to test.

-Baris

> +}
>   append expected "print 23\n"
>   append expected "save history $filename\n"
> 
> --
> Cheers,
> Guinevere Larsen
> It/she


Intel Deutschland GmbH
Registered Address: Dornacher Strasse 1, 85622 Feldkirchen, Germany
Tel: +49 89 991 430, www.intel.de
Managing Directors: Harry Demas, Jeffrey Schneiderman, Yin Chong Sorrell
Chairperson of the Supervisory Board: Nicole Lau
Registered Seat: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928