From: Pedro Alves <pedro@palves.net>
Date: Wed, 17 Apr 2024 19:59:09 +0000 (+0100)
Subject: Eliminate gdb_is_target_remote / gdb_is_target_native & friends
X-Git-Tag: gdb-15-branchpoint~231
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e42e3415a080a1f38755b219bb26f784ba2e8261;p=thirdparty%2Fbinutils-gdb.git

Eliminate gdb_is_target_remote / gdb_is_target_native & friends

After the previous patches, gdb_is_target_remote,
gdb_is_target_native, and mi_is_target_remote aren't used anywhere.
This commit eliminates them, along with now unnecessary helpers.

Change-Id: I54f9ae1f5aed3f640e5758731cf4954e6dbb1bee
Approved-By: Tom Tromey <tom@tromey.com>
---

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 35f452c452d..d092258a9e5 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4713,74 +4713,6 @@ proc have_longjmp_probe {} {
     return $have_probe
 }
 
-# Helper for gdb_is_target_* procs.  TARGET_NAME is the name of the target
-# we're looking for (used to build the test name).  TARGET_STACK_REGEXP
-# is a regexp that will match the output of "maint print target-stack" if
-# the target in question is currently pushed.  PROMPT_REGEXP is a regexp
-# matching the expected prompt after the command output.
-#
-# NOTE: GDB must be running BEFORE this procedure is called!
-
-proc gdb_is_target_1 { target_name target_stack_regexp prompt_regexp } {
-    global gdb_spawn_id
-
-    # Throw a Tcl error if gdb isn't already started.
-    if {![info exists gdb_spawn_id]} {
-	error "gdb_is_target_1 called with no running gdb instance"
-    }
-
-    set test "probe for target ${target_name}"
-    gdb_test_multiple "maint print target-stack" $test \
-	-prompt "$prompt_regexp" {
-	    -re "${target_stack_regexp}${prompt_regexp}" {
-		pass $test
-		return 1
-	    }
-	    -re "$prompt_regexp" {
-		pass $test
-	    }
-	}
-    return 0
-}
-
-# Helper for gdb_is_target_remote where the expected prompt is variable.
-#
-# NOTE: GDB must be running BEFORE this procedure is called!
-
-proc gdb_is_target_remote_prompt { prompt_regexp } {
-    return [gdb_is_target_1 "remote" ".*emote target using gdb-specific protocol.*" $prompt_regexp]
-}
-
-# Check whether we're testing with the remote or extended-remote
-# targets.
-#
-# This is meant to be used on testcases that connect to targets
-# different from the default board protocol.  For most tests, you can
-# check whether gdb_protocol is "remote" or "extended-remote" instead
-# (or call gdb_protocol_is_remote for either).
-#
-# NOTE: GDB must be running BEFORE this procedure is called!
-
-proc gdb_is_target_remote { } {
-    global gdb_prompt
-
-    return [gdb_is_target_remote_prompt "$gdb_prompt $"]
-}
-
-# Check whether we're testing with the native target.
-#
-# This is meant to be used on testcases that connect to targets
-# different from the default board protocol.  For most tests, you can
-# check whether gdb_protocol is the empty string instead.
-#
-# NOTE: GDB must be running BEFORE this procedure is called!
-
-proc gdb_is_target_native { } {
-    global gdb_prompt
-
-    return [gdb_is_target_1 "native" ".*native \\(Native process\\).*" "$gdb_prompt $"]
-}
-
 # Returns true if gdb_protocol is empty, indicating use of the native
 # target.
 
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index b3a27efb155..aa0f9df6c3a 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -2863,15 +2863,6 @@ proc mi_skip_libstdcxx_probe_tests {} {
     return [skip_libstdcxx_probe_tests_prompt "$mi_gdb_prompt$"]
 }
 
-# Check whether we're testing with the remote or extended-remote
-# targets.
-
-proc mi_is_target_remote {} {
-    global mi_gdb_prompt
-
-    return [gdb_is_target_remote_prompt "$mi_gdb_prompt"]
-}
-
 # Retrieve the value of EXP in the inferior, represented in format
 # specified in FMT (using "printFMT").  DEFAULT is used as fallback if
 # print fails.  TEST is the test message to use.  It can be omitted,