From bc6004dfd2654e53d6f167b985b38ca780e79228 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedro@palves.net>
Date: Wed, 30 Mar 2022 14:31:56 +0100
Subject: [PATCH] Remove gdb_test questions that GDB doesn't ask

Change-Id: Ib2616dc883e9dc9ee100f6c86d83a921a0113c16
---
 gdb/testsuite/gdb.base/auxv.exp            | 3 +--
 gdb/testsuite/gdb.base/catch-fork-kill.exp | 3 +--
 gdb/testsuite/gdb.base/default.exp         | 2 +-
 gdb/testsuite/gdb.base/style.exp           | 4 +---
 gdb/testsuite/gdb.multi/tids.exp           | 2 +-
 gdb/testsuite/gdb.server/solib-list.exp    | 3 +--
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index c5384a51b93..390f559a4a3 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -158,8 +158,7 @@ proc do_core_test {works corefile test1 test2} {
 	unsupported $test2
     } else {
 	gdb_test "core $corefile" "Core was generated by.*" \
-	    "load core file for $test1" \
-	    "A program is being debugged already.*" "y"
+	    "load core file for $test1"
 	set core_data [fetch_auxv $test1]
 	global live_data
 	if {$core_data == $live_data} {
diff --git a/gdb/testsuite/gdb.base/catch-fork-kill.exp b/gdb/testsuite/gdb.base/catch-fork-kill.exp
index 98a6c66db3d..67fb84706a0 100644
--- a/gdb/testsuite/gdb.base/catch-fork-kill.exp
+++ b/gdb/testsuite/gdb.base/catch-fork-kill.exp
@@ -74,8 +74,7 @@ proc do_test {fork_kind exit_kind} {
 	    "Catchpoint \[0-9\]* \\(${fork_kind}ed process \[0-9\]*\\),.*" \
 	    "continue to grandchild ${fork_kind}"
 
-	gdb_test "kill inferior 2" "" "kill child" \
-	    "Kill the program being debugged.*y or n. $" "y"
+	gdb_test "kill inferior 2" "" "kill child"
 
 	gdb_test "inferior 1" "Switching to inferior 1 .*" "switch to parent"
 
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index f7859c9a479..23379f6ec01 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -455,7 +455,7 @@ gdb_test "restore" "You can't do that without a process to debug\."
 #test return
 # The middle case accomodated the obsolete a29k, where doing the "ni"
 # above causes an initial stack to be created.
-gdb_test "return" "No selected frame..*" "return"  "Make .* return now.*y or n. $" "y"
+gdb_test "return" "No selected frame..*"
 
 
 #test reverse-search
diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index 6bb5e1c9ac0..2064e8d3894 100644
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -266,9 +266,7 @@ proc run_style_tests { } {
 	}
 	gdb_test "file $binfile" \
 	    $pass_re \
-	    "filename is styled when loading symbol file" \
-	    "Are you sure you want to change the file.*" \
-	    "y"
+	    "filename is styled when loading symbol file"
 
 	gdb_test "pwd" "Working directory [limited_style .*? file].*"
 
diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp
index d8ba3cae97d..fb7c2a29a71 100644
--- a/gdb/testsuite/gdb.multi/tids.exp
+++ b/gdb/testsuite/gdb.multi/tids.exp
@@ -428,7 +428,7 @@ if { ![skip_python_tests] } {
 # Remove the second inferior and confirm that GDB goes back to showing
 # single-number thread IDs.
 with_test_prefix "back to one inferior" {
-    gdb_test "kill inferior 2" "" "kill inferior 2" "Kill the program being debugged.*" "y"
+    gdb_test "kill inferior 2" "" "kill inferior 2"
     gdb_test "thread 1.1" "Switching to thread 1\.1 .*"
     gdb_test "remove-inferior 2" ".*" "remove inferior 2"
 
diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp
index 117cb682216..db549d1ce15 100644
--- a/gdb/testsuite/gdb.server/solib-list.exp
+++ b/gdb/testsuite/gdb.server/solib-list.exp
@@ -92,8 +92,7 @@ foreach nonstop { 0 1 } { with_test_prefix "non-stop $nonstop" {
     # but before "target remote" below so that qSymbol data get already
     # initialized from BINFILE (and not from ld.so first needing a change to
     # BINFILE later).
-    gdb_test "file ${binfile}" {Reading symbols from .*\.\.\..*} "file binfile" \
-	     {(Are you sure you want to change the file|Load new symbol table from ".*")\? \(y or n\) } "y"
+    gdb_test "file ${binfile}" {Reading symbols from .*\.\.\..*} "file binfile"
 
     set test "target $gdbserver_protocol"
     set ok 0
-- 
2.30.2