From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 8A98E3854806; Fri, 13 Jan 2023 20:37:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A98E3854806 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642269; bh=vIAJC03d8IgKw3/jRpnBAwi7wC/+LE/6Cbg7v4AbAzU=; h=From:To:Subject:Date:From; b=FyviqNTE/bIMdKTMNg8rdKFKceOEVZPpJZqAvD7+4mcVViGVykiwPbFCmkqfqDJ/i NxT/XBgKOfFeq4KZT0PtTJAKXYmz8eG+3i9wur5B9s/wQOqtA6waBab73CHz+swPTo MAxQ0S/qHSLiwwz1aH+nYmKQEB4uWKuHVuZKadk0= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Rewrite skip_python_tests X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 4b075c16ef8d28c238892acf51ec7d672f4db929 X-Git-Newrev: 222ef1693c7a2abe00f0297405c8fe7e135d050e Message-Id: <20230113203749.8A98E3854806@sourceware.org> Date: Fri, 13 Jan 2023 20:37:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D222ef1693c7a= 2abe00f0297405c8fe7e135d050e commit 222ef1693c7a2abe00f0297405c8fe7e135d050e Author: Tom Tromey Date: Fri Jan 6 20:36:38 2023 -0700 Rewrite skip_python_tests =20 This rewrites skip_python_tests to examine the output of "gdb --configuration". This is a bit nicer because it does not require an already-running gdb. Diff: --- gdb/testsuite/lib/gdb.exp | 24 +++--------------------- gdb/testsuite/lib/mi-support.exp | 5 +---- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3d416f902b8..64eef9701c2 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2449,28 +2449,10 @@ proc skip_rust_tests {} { } =20 # Return a 1 for configurations that do not support Python scripting. -# PROMPT_REGEXP is the expected prompt. =20 -proc skip_python_tests_prompt { prompt_regexp } { - gdb_test_multiple "python print ('test')" "verify python support" \ - -prompt "$prompt_regexp" { - -re "not supported.*$prompt_regexp" { - unsupported "Python support is disabled." - return 1 - } - -re "$prompt_regexp" {} - } - - return 0 -} - -# Return a 1 for configurations that do not support Python scripting. -# Note: This also sets various globals that specify which version of Python -# is in use. See skip_python_tests_prompt. - -proc skip_python_tests {} { - global gdb_prompt - return [skip_python_tests_prompt "$gdb_prompt $"] +gdb_caching_proc skip_python_tests { + set output [remote_exec host $::GDB --configuration] + return [expr {[string first "--with-python" $output] =3D=3D -1}] } =20 # Return a 1 if we should skip shared library tests. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-suppor= t.exp index 1ee087d8127..f756cbe2d73 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -2735,12 +2735,9 @@ proc mi_make_breakpoint_table {bp_list} { } =20 # Return a 1 for configurations that do not support Python scripting. -# Note: This also sets various globals that specify which version of Python -# is in use. See skip_python_tests_prompt. =20 proc mi_skip_python_tests {} { - global mi_gdb_prompt - return [skip_python_tests_prompt "$mi_gdb_prompt$"] + return [skip_python_tests] } =20 # As skip_libstdcxx_probe_tests_prompt, with mi_gdb_prompt.