[binutils-gdb] Fix test case gdb.base/valgrind-bt.exp.

[binutils-gdb] Fix test case gdb.base/valgrind-bt.exp.

[Carl Love]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6d5702a5eb313c8c3195edc21eebf6ef312a3fcc

commit 6d5702a5eb313c8c3195edc21eebf6ef312a3fcc
Author: Carl Love <cel@us.ibm.com>
Date:   Thu Apr 15 17:21:51 2021 -0500

    Fix test case gdb.base/valgrind-bt.exp.
    
    gdb/testsuite/ChangeLog:
    
            * gdb.base/valgrind-bt.exp: Add gdb_test "break main".
            Update expected string for gdb_test "bt".
    
            * lib/valgrind.exp: Add set remotetimeout 3.
            Increase vgdb wait from 1 to 2.
            Add max-invoke-ms option to vgdb command line.

Diff:
---
 gdb/testsuite/ChangeLog                | 9 +++++++++
 gdb/testsuite/gdb.base/valgrind-bt.exp | 4 +++-
 gdb/testsuite/lib/valgrind.exp         | 5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 44fa9f35fef..5049974bf35 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2021-04-21  Carl Love  <cel@us.ibm.com>
+
+	* gdb.base/valgrind-bt.exp: Add gdb_test "break main".
+	Update expected string for gdb_test "bt".
+
+	* lib/valgrind.exp: Add set remotetimeout 3.
+	Increase vgdb wait from 1 to 2.
+	Add max-invoke-ms option to vgdb command line.
+
 2021-04-21  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
 
 	* gdb.mi/mi-break.exp: Extend with checks for invalid breakpoint
diff --git a/gdb/testsuite/gdb.base/valgrind-bt.exp b/gdb/testsuite/gdb.base/valgrind-bt.exp
index bc6b0a384dd..b559e433d72 100644
--- a/gdb/testsuite/gdb.base/valgrind-bt.exp
+++ b/gdb/testsuite/gdb.base/valgrind-bt.exp
@@ -31,6 +31,8 @@ if { [vgdb_start] == -1 } {
 
 set double_free [gdb_get_line_number "double-free"]
 
+gdb_breakpoint "main"
+
 set test "continue"
 gdb_test_multiple "continue" $test {
     -re "Invalid free\\(\\).*: main \\(${srcfile}:$double_free\\)\r\n.*$gdb_prompt $" {
@@ -57,7 +59,7 @@ gdb_test_multiple "continue" $test {
 gdb_test_no_output "set height 0"
 gdb_test_no_output "set width 0"
 
-gdb_test "bt" "in main \\(.*\\) at .*${srcfile}:$double_free"
+gdb_test "bt" "#\[0-9 ]+main \\(.*\\) at .*${srcfile}.*"
 
 # Explicitly kill the program so it doesn't dump core when we quit->detach.
 gdb_test "kill" "" "kill program" "Kill the program being debugged.*y or n. $" "y"
diff --git a/gdb/testsuite/lib/valgrind.exp b/gdb/testsuite/lib/valgrind.exp
index c214491f7b8..caabeda9730 100644
--- a/gdb/testsuite/lib/valgrind.exp
+++ b/gdb/testsuite/lib/valgrind.exp
@@ -82,12 +82,15 @@ proc vgdb_start { {active_at_startup 1} } {
 
     clean_restart $testfile
 
+    set vgdbcmd "set remotetimeout 3"
+
     # Make sure we're disconnected, in case we're testing with the
     # native-extended-gdbserver board, where gdb_start/gdb_load spawn
     # gdbserver and connect to it.
     gdb_test "disconnect" ".*"
 
-    set vgdbcmd "target remote | vgdb --wait=1 --pid=$vgdbpid"
+    set vgdbcmd "target remote | vgdb --wait=2 --max-invoke-ms=2500 --pid=$vgdbpid"
+
     if { $active_at_startup } {
 	gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb"
     } else {