From patchwork Thu Jan 12 03:00:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63052 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2F28E385B51E for ; Thu, 12 Jan 2023 03:07:00 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id F22393881D26 for ; Thu, 12 Jan 2023 03:01:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F22393881D26 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 768751003F5F8 for ; Thu, 12 Jan 2023 03:01:32 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id FnqOp34xuFxgHFnqOpCGpF; Thu, 12 Jan 2023 03:01:32 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=ePfWMFl1 c=1 sm=1 tr=0 ts=63bf780c a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=vENXm_DViqj_7yCyjuAA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=LRvLHLPUUUawwXVRJ+/jOTLcxrn6L5AUnzveJc+T7Lo=; b=uiQA7IABDPeinJqbbxGRgFcMMV HcSXX01XSNUZs6LOx1Uiq08qidzbEI7aYBu4+2PxRZpYygbi7RMy7pTl35YuEVGUzbGOrMyWVlLYK fS1zWmc9xwVXMEX7Msr7I1uFH; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:38160 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pFnqO-000lq2-7H; Wed, 11 Jan 2023 20:01:32 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 47/79] Rewrite skip_python_tests Date: Wed, 11 Jan 2023 20:00:20 -0700 Message-Id: <20230112030052.3306113-48-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230112030052.3306113-1-tom@tromey.com> References: <20230112030052.3306113-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pFnqO-000lq2-7H X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:38160 X-Source-Auth: tom+tromey.com X-Email-Count: 48 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 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. --- 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 {} { } # Return a 1 for configurations that do not support Python scripting. -# PROMPT_REGEXP is the expected prompt. -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] == -1}] } # Return a 1 if we should skip shared library tests. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.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} { } # 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 mi_skip_python_tests {} { - global mi_gdb_prompt - return [skip_python_tests_prompt "$mi_gdb_prompt$"] + return [skip_python_tests] } # As skip_libstdcxx_probe_tests_prompt, with mi_gdb_prompt.