From patchwork Thu Jul 6 17:23:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Baldwin X-Patchwork-Id: 72262 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 8F6CB385B800 for ; Thu, 6 Jul 2023 17:26:47 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail.baldwin.cx (bigwig.baldwin.cx [IPv6:2607:f138:0:13::2]) by sourceware.org (Postfix) with ESMTPS id E0A043858C2D for ; Thu, 6 Jul 2023 17:26:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E0A043858C2D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=FreeBSD.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=FreeBSD.org Received: from ralph.baldwin.net (c-98-35-126-114.hsd1.ca.comcast.net [98.35.126.114]) by mail.baldwin.cx (Postfix) with ESMTPSA id 1BD881A84E1C for ; Thu, 6 Jul 2023 13:26:31 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH v2 3/4] Add a have_native_target helper function for use with require. Date: Thu, 6 Jul 2023 10:23:36 -0700 Message-Id: <20230706172337.39099-4-jhb@FreeBSD.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230706172337.39099-1-jhb@FreeBSD.org> References: <20230706172337.39099-1-jhb@FreeBSD.org> MIME-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (mail.baldwin.cx [0.0.0.0]); Thu, 06 Jul 2023 13:26:31 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.103.1 at mail.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KHOP_HELO_FCRDNS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE 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" Move logic from auto-connect-native-target.exp into this helper. --- .../gdb.base/auto-connect-native-target.exp | 18 +----------------- gdb/testsuite/lib/gdb.exp | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/gdb/testsuite/gdb.base/auto-connect-native-target.exp b/gdb/testsuite/gdb.base/auto-connect-native-target.exp index 002a6d61126..0586cd4baf4 100644 --- a/gdb/testsuite/gdb.base/auto-connect-native-target.exp +++ b/gdb/testsuite/gdb.base/auto-connect-native-target.exp @@ -22,23 +22,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } -# Whether this GDB is configured with a "native" target. -set have_native 0 - -set test "help target native" -gdb_test_multiple $test $test { - -re "Undefined target command.*$gdb_prompt $" { - set have_native 0 - } - -re "Native process.*$gdb_prompt $" { - set have_native 1 - } -} - -if { !$have_native } { - unsupported "no \"target native\" support." - return -} +require have_native_target # Returns the topmost target pushed on the target stack. TEST is used # as test message. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index b4900ae25a6..0a7c593672a 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -9807,6 +9807,20 @@ gdb_caching_proc have_compile_and_link_flag { flag } { additional_flags=$flag] } +# Return 1 if this GDB is configured with a "native" target. + +gdb_caching_proc have_native_target {} { + gdb_test_multiple "help target native" "" { + -re -wrap "Undefined target command.*" { + return 0 + } + -re -wrap "Native process.*" { + return 1 + } + } + return 0 +} + # Handle include file $srcdir/$subdir/FILE. proc include_file { file } {