From patchwork Thu Jan 12 03:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63040 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 B41A4395A45D for ; Thu, 12 Jan 2023 03:06:11 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by sourceware.org (Postfix) with ESMTPS id 270AF38432FD for ; Thu, 12 Jan 2023 03:01:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 270AF38432FD 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id A058110043B4E for ; Thu, 12 Jan 2023 03:01:42 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id FnqYpOwmDNX2aFnqYpDVQb; Thu, 12 Jan 2023 03:01:42 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=63bf7816 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=ey_ZM3LifXfgtAIchd0A: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=AMomKj9Jc+rUKLrGvBtPsk+PWbezMiMcGP2IUiKfSOY=; b=V2mvIq7I5aL9MSlZtjBhSnjdd9 MiIsyM3NiZyJdmsQ6zRu3T6sVsvuqdT3jcm72duMUFVPvPUCnVW9Fi7q+Qv+h7+qwmRuEap+0JTmQ 3zvKZA6UguYE4xTPWRmkVTcGH; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:60786 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 1pFnqY-000mAD-Bx; Wed, 11 Jan 2023 20:01:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 61/79] Rename to allow_dlmopen_tests Date: Wed, 11 Jan 2023 20:00:34 -0700 Message-Id: <20230112030052.3306113-62-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: 1pFnqY-000mAD-Bx X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:60786 X-Source-Auth: tom+tromey.com X-Email-Count: 62 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 changes skip_dlmopen_tests to invert the sense, and renames it to allow_dlmopen_tests. --- gdb/testsuite/gdb.base/dlmopen.exp | 2 +- gdb/testsuite/lib/gdb.exp | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gdb/testsuite/gdb.base/dlmopen.exp b/gdb/testsuite/gdb.base/dlmopen.exp index 54a5eadee2d..ddb832a64f8 100644 --- a/gdb/testsuite/gdb.base/dlmopen.exp +++ b/gdb/testsuite/gdb.base/dlmopen.exp @@ -21,7 +21,7 @@ # We test that GDB shows the correct number of instances of the libraries # the test loaded while unloading them one-by-one. -require !skip_dlmopen_tests +require allow_dlmopen_tests standard_testfile diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index e2feebfab8f..edf26e7b999 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2476,17 +2476,17 @@ proc skip_shlib_tests {} { return 1 } -# Return 1 if we should skip dlmopen tests, 0 if we should not. +# Return 1 if we should run dlmopen tests, 0 if we should not. -gdb_caching_proc skip_dlmopen_tests { +gdb_caching_proc allow_dlmopen_tests { global srcdir subdir gdb_prompt inferior_exited_re # We need shared library support. if { [skip_shlib_tests] } { - return 1 + return 0 } - set me "skip_dlmopen_tests" + set me "allow_dlmopen_tests" set lib { int foo (void) { return 42; @@ -2536,13 +2536,13 @@ gdb_caching_proc skip_dlmopen_tests { if { [gdb_compile_shlib $libsrc $libout {debug}] != "" } { verbose -log "failed to build library" - return 1 + return 0 } if { ![gdb_simple_compile $me $src executable \ [list shlib_load debug \ additional_flags=-DDSO_NAME=\"$libout\"]] } { verbose -log "failed to build executable" - return 1 + return 0 } gdb_exit @@ -2552,24 +2552,24 @@ gdb_caching_proc skip_dlmopen_tests { if { [gdb_run_cmd] != 0 } { verbose -log "failed to start skip test" - return 1 + return 0 } gdb_expect { -re "$inferior_exited_re normally.*${gdb_prompt} $" { - set skip_dlmopen_tests 0 + set allow_dlmopen_tests 1 } -re "$inferior_exited_re with code.*${gdb_prompt} $" { - set skip_dlmopen_tests 1 + set allow_dlmopen_tests 0 } default { warning "\n$me: default case taken" - set skip_dlmopen_tests 1 + set allow_dlmopen_tests 0 } } gdb_exit - verbose "$me: returning $skip_dlmopen_tests" 2 - return $skip_dlmopen_tests + verbose "$me: returning $allow_dlmopen_tests" 2 + return $allow_dlmopen_tests } # Return 1 if we should skip tui related tests.