From af4c1c9168866db3ee4c2906f17fc4204adff1f7 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Sat, 7 Jan 2023 11:51:33 -0700
Subject: [PATCH] Remove mi_skip_python_tests

mi_skip_python_tests was necessary because skip_python_tests used the
running gdb, and so needed to know what prompt to expect.  Now that
skip_python_tests has been rewritten, mi_skip_python_tests is no
longer needed.
---
 gdb/testsuite/gdb.python/py-mi-events.exp                   | 2 +-
 gdb/testsuite/gdb.python/py-mi-objfile.exp                  | 2 +-
 gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp | 2 +-
 gdb/testsuite/lib/mi-support.exp                            | 6 ------
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/gdb/testsuite/gdb.python/py-mi-events.exp b/gdb/testsuite/gdb.python/py-mi-events.exp
index 48cead34752..d3ffb154d91 100644
--- a/gdb/testsuite/gdb.python/py-mi-events.exp
+++ b/gdb/testsuite/gdb.python/py-mi-events.exp
@@ -31,7 +31,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if { [mi_skip_python_tests] } { return }
+if { [skip_python_tests] } { return }
 
 set remote_python_file [gdb_remote_download host ${srcdir}/${subdir}/${pyfile}]
 
diff --git a/gdb/testsuite/gdb.python/py-mi-objfile.exp b/gdb/testsuite/gdb.python/py-mi-objfile.exp
index 5dbb3b71f92..2aaf65d0b7c 100644
--- a/gdb/testsuite/gdb.python/py-mi-objfile.exp
+++ b/gdb/testsuite/gdb.python/py-mi-objfile.exp
@@ -31,7 +31,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if { [mi_skip_python_tests] } { return }
+if { [skip_python_tests] } { return }
 
 # Make the -gdb.py script available to gdb, it is automagically loaded by gdb.
 # Care is taken to put it in the same directory as the binary so that
diff --git a/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp b/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
index 9d9810f2077..77227b60e34 100644
--- a/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
+++ b/gdb/testsuite/gdb.python/py-mi-var-info-path-expression.exp
@@ -30,7 +30,7 @@ if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" }
 mi_clean_restart $binfile
 
 # Skip all tests if Python scripting is not enabled.
-if { [mi_skip_python_tests] } { continue }
+if { [skip_python_tests] } { continue }
 
 set pyfile [gdb_remote_download host ${srcdir}/${subdir}/${testfile}.py]
 mi_gdb_test "source ${pyfile}" \
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index f756cbe2d73..b6da2c4baf0 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -2734,12 +2734,6 @@ proc mi_make_breakpoint_table {bp_list} {
     return "BreakpointTable={nr_rows=\"$nr\",nr_cols=\"$nc\",$header,$body}"
 }
 
-# Return a 1 for configurations that do not support Python scripting.
-
-proc mi_skip_python_tests {} {
-    return [skip_python_tests]
-}
-
 # As skip_libstdcxx_probe_tests_prompt, with mi_gdb_prompt.
 
 proc mi_skip_libstdcxx_probe_tests {} {
-- 
2.30.2