[pushed 1/2] [gdb/testsuite] Allow procs with default value args in with_override

[pushed 1/2] [gdb/testsuite] Allow procs with default value args in with_override

[Tom de Vries]

Currently proc with_override does not work with procs with default value args.

Fix this, and add a test-case excercising this scenario.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.testsuite/with-override.exp | 81 +++++++++++++++++++
 gdb/testsuite/lib/gdb.exp                     | 20 ++++-
 2 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 gdb/testsuite/gdb.testsuite/with-override.exp

diff --git a/gdb/testsuite/gdb.testsuite/with-override.exp b/gdb/testsuite/gdb.testsuite/with-override.exp
new file mode 100644
index 00000000000..dbd0064ffb0
--- /dev/null
+++ b/gdb/testsuite/gdb.testsuite/with-override.exp
@@ -0,0 +1,81 @@
+# Copyright 2023 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/>.
+
+# Check with_override proc.
+
+proc foo {} {
+    return 0
+}
+
+proc foo1 {} {
+    return 1
+}
+
+proc foo2 {} {
+    return 2
+}
+
+with_test_prefix no-args {
+
+    with_test_prefix before {
+	gdb_assert { [foo] == 0 }
+    }
+
+    with_override foo foo1 {
+	with_test_prefix foo1 {
+	    gdb_assert { [foo] == 1 }
+	}
+
+	with_override foo foo2 {
+	    with_test_prefix foo2 {
+		gdb_assert { [foo] == 2 }
+	    }
+	}
+    }
+
+    with_test_prefix after {
+	gdb_assert { [foo] == 0 }
+    }
+}
+
+proc foo { {a 0} } {
+    return [expr $a + 1]
+}
+
+proc foo_plus_1 { {a 0} } {
+    return [expr $a + 2]
+}
+
+with_test_prefix default-arg {
+
+    with_test_prefix before {
+	gdb_assert { [foo] == 1 }
+	gdb_assert { [foo 0] == 1 }
+	gdb_assert { [foo 1] == 2 }
+    }
+
+    with_override foo foo_plus_1 {
+	with_test_prefix foo_plus_1 {
+	    gdb_assert { [foo] == 2 }
+	    gdb_assert { [foo 0] == 2 }
+	    gdb_assert { [foo 1] == 3 }
+	}
+    }
+
+    with_test_prefix after {
+	gdb_assert { [foo] == 1 }
+	gdb_assert { [foo 0] == 1 }
+	gdb_assert { [foo 1] == 2 }
+    }
+}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c3e5d4891dc..f214a6bb54d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -9062,6 +9062,22 @@ proc hex_in_list { val hexlist } {
     return [expr $index != -1]
 }
 
+# As info args, but also add the default values.
+
+proc info_args_with_defaults { name } {
+    set args {}
+
+    foreach arg [info args $name] {
+	if { [info default $name $arg default_value] } {
+	    lappend args [list $arg $default_value]
+	} else {
+	    lappend args $arg
+	}
+    }
+
+    return $args
+}
+
 # Override proc NAME to proc OVERRIDE for the duration of the execution of
 # BODY.
 
@@ -9081,7 +9097,7 @@ proc with_override { name override body } {
 
     # Save the old proc, if it exists.
     if { [info procs $name] != "" } {
-	set old_args [info args $name]
+	set old_args [info_args_with_defaults $name]
 	set old_body [info body $name]
 	set existed true
     } else {
@@ -9089,7 +9105,7 @@ proc with_override { name override body } {
     }
 
     # Install the override.
-    set new_args [info args $override]
+    set new_args [info_args_with_defaults $override]
     set new_body [info body $override]
     eval proc $name {$new_args} {$new_body}
 

base-commit: 40bea10383b36fbe451d91ed0513792c399de1a6
-- 
2.35.3

[pushed 2/2] [gdb/testsuite] Fix and add prompt anchoring in tuiterm

[Tom de Vries]

There is a test-case that contains a unit test for tuiterm:
gdb.tui/tuiterm.exp.

However, this only excercises the tuiterm itself, and not the functions that
interact with it, like Term::command.

Add a new test-case gdb.tui/tuiterm-2.exp that:
- overrides proc accept_gdb_output (to be able simulate incorrect responses
  while avoiding the timeout),
- overrides proc send_gdb (to be able to call Term::command without a gdb
  instance, such that all tuiterm input is generated by the test-case).
- issues Term::command calls, and
- checks whether they behave correctly.

This exposes a problem in Term::command.  The "prompt before command" regexp
starts with a bit that is supposed to anchor the prompt to the border:
...
	set str "(^|\|)$gdb_prompt $str"
...
but that doesn't work due to insufficient escaping.  Fix this by adding the
missing escape:
...
	set str "(^|\\|)$gdb_prompt $str"
...

Futhermore, the "prompt after command" regexp in Term::wait_for has no
anchoring at all:
...
	set prompt_wait_for "$gdb_prompt \$"
...
so add that as well.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.tui/tuiterm-2.exp | 98 +++++++++++++++++++++++++++++
 gdb/testsuite/lib/tuiterm.exp       |  4 +-
 2 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 gdb/testsuite/gdb.tui/tuiterm-2.exp

diff --git a/gdb/testsuite/gdb.tui/tuiterm-2.exp b/gdb/testsuite/gdb.tui/tuiterm-2.exp
new file mode 100644
index 00000000000..e7a0f03e4ba
--- /dev/null
+++ b/gdb/testsuite/gdb.tui/tuiterm-2.exp
@@ -0,0 +1,98 @@
+# Copyright 2023 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/>.
+
+# Check tuiterm procs that interact with gdb as well as tuiterm.
+
+tuiterm_env
+
+proc test_accept_gdb_output { } {
+    if { $::action_cnt == [llength $::actions] } {
+	return 0
+    }
+    set action [lindex $::actions $::action_cnt]
+    incr ::action_cnt
+
+    uplevel $action
+
+    return 1
+}
+
+proc test_send_gdb { string } {
+    set expected [lindex $::expect_send $::send_cnt]
+    gdb_assert { [string equal $string $expected] }
+
+    incr ::send_cnt
+}
+
+with_override Term::accept_gdb_output test_accept_gdb_output {
+    with_override send_gdb test_send_gdb {
+
+	foreach_with_prefix border { "" "|" } {
+	    with_test_prefix "Term::command match" {
+		Term::_setup 4 20
+		set send_cnt 0
+		set expect_send { foo\n }
+		set action_cnt 0
+		set actions {
+		    {
+			Term::_insert "${::border}(gdb) foo"
+		    }
+		    {
+			Term::_ctl_0x0d
+			Term::_ctl_0x0a
+			Term::_insert "${::border}(gdb) "
+		    }
+		}
+		gdb_assert { [Term::command "foo"] }
+	    }
+
+	    with_test_prefix "Term::command mismatch" {
+		Term::_setup 4 20
+		set send_cnt 0
+		set expect_send { foo\n }
+		set action_cnt 0
+		set actions {
+		    {
+			Term::_insert "$::border (gdb) foo"
+		    }
+		    {
+			Term::_ctl_0x0d
+			Term::_ctl_0x0a
+			Term::_insert "${::border}(gdb) "
+		    }
+		}
+		gdb_assert { ![Term::command "foo"] }
+	    }
+
+	    with_test_prefix "Term::command mismatch 2" {
+		Term::_setup 4 20
+		set send_cnt 0
+		set expect_send { foo\n }
+		set action_cnt 0
+		set actions {
+		    {
+			Term::_insert "${::border}(gdb) foo"
+		    }
+		    {
+			Term::_ctl_0x0d
+			Term::_ctl_0x0a
+			Term::_insert "${::border} (gdb) "
+		    }
+		}
+		gdb_assert { ![Term::command "foo"] }
+	    }
+	}
+    }
+}
diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp
index 171b242aa80..dc928ae5aff 100644
--- a/gdb/testsuite/lib/tuiterm.exp
+++ b/gdb/testsuite/lib/tuiterm.exp
@@ -788,7 +788,7 @@ namespace eval Term {
 
 	set fn "wait_for"
 
-	set prompt_wait_for "$gdb_prompt \$"
+	set prompt_wait_for "(^|\\|)$gdb_prompt \$"
 	debug_tui_matching "$fn: regexp: '$wait_for'"
 
 	while 1 {
@@ -909,7 +909,7 @@ namespace eval Term {
 	global gdb_prompt
 	send_gdb "$cmd\n"
 	set str [string_to_regexp $cmd]
-	set str "(^|\|)$gdb_prompt $str"
+	set str "(^|\\|)$gdb_prompt $str"
 	wait_for $str
     }
 
-- 
2.35.3