From patchwork Sat Dec 17 00:08:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62072 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 D16BF388C5F0 for ; Sat, 17 Dec 2022 00:13:26 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id DA5CD38330A4 for ; Sat, 17 Dec 2022 00:08:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DA5CD38330A4 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 cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 4CE7110046FA3 for ; Sat, 17 Dec 2022 00:08:49 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6Kkzp9EstR8oI6KkzpfX9k; Sat, 17 Dec 2022 00:08:49 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=DseTREz+ c=1 sm=1 tr=0 ts=639d0891 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=sHyYjHe8cH0A:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=USroW288tnGdgFkNXCYA: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=RGI1A4gLvieqzfUYSSOjp6kgWMvbuc6yF6iqkUTMwDU=; b=aMzK5MiKBQnKwbMK8pjX8yqfvv ijR0mB1ZNbj0A0nw60gGc2oTDADUlaZZRsPlDr76438eL6CDJ5VeHZYD6Wb8HZriC3KXy8fm57BqS lAc7yN7rU1/muxUvlmCpLpNg+; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:60554 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 1p6Kkz-002h2t-3o; Fri, 16 Dec 2022 17:08:49 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 41/46] Use require skip_perf_tests Date: Fri, 16 Dec 2022 17:08:13 -0700 Message-Id: <20221217000818.3729389-42-tom@tromey.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217000818.3729389-1-tom@tromey.com> References: <20221217000818.3729389-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: 1p6Kkz-002h2t-3o X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:60554 X-Source-Auth: tom+tromey.com X-Email-Count: 42 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.3 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 some tests to use "require skip_perf_tests". --- gdb/testsuite/gdb.perf/backtrace.exp | 4 +--- gdb/testsuite/gdb.perf/disassemble.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-runto-main.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1-select-file.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster1.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-runto-main.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2-select-file.exp | 4 +--- gdb/testsuite/gdb.perf/gmonster2.exp | 4 +--- gdb/testsuite/gdb.perf/single-step.exp | 4 +--- gdb/testsuite/gdb.perf/skip-command.exp | 4 +--- gdb/testsuite/gdb.perf/skip-prologue.exp | 4 +--- gdb/testsuite/gdb.perf/solib.exp | 4 +--- gdb/testsuite/gdb.perf/template-breakpoints.exp | 4 +--- 21 files changed, 21 insertions(+), 63 deletions(-) diff --git a/gdb/testsuite/gdb.perf/backtrace.exp b/gdb/testsuite/gdb.perf/backtrace.exp index a5a4428844c..524cf236080 100644 --- a/gdb/testsuite/gdb.perf/backtrace.exp +++ b/gdb/testsuite/gdb.perf/backtrace.exp @@ -21,9 +21,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/disassemble.exp b/gdb/testsuite/gdb.perf/disassemble.exp index 9902b0dc225..8e12ca79e5c 100644 --- a/gdb/testsuite/gdb.perf/disassemble.exp +++ b/gdb/testsuite/gdb.perf/disassemble.exp @@ -17,9 +17,7 @@ # some large functions in GDB. load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests global GDB diff --git a/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp b/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp index b1ebf52c237..f4522f19af2 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-null-lookup.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-null-lookup.py NullLookup diff --git a/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp b/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp index 52fcf46ba21..8aedccc1077 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-pervasive-typedef.exp @@ -21,8 +21,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-pervasive-typedef.py PervasiveTypedef diff --git a/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp b/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp index f5444eea26f..0f7e7f9a6bb 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-print-cerr.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-print-cerr.py PrintCerr diff --git a/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp b/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp index ae6f10eceae..5b01d013f89 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-ptype-string.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-ptype-string.py GmonsterPtypeString diff --git a/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp b/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp index 4250d17392f..7a9def1c18f 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-runto-main.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-runto-main.py GmonsterRuntoMain diff --git a/gdb/testsuite/gdb.perf/gmonster1-select-file.exp b/gdb/testsuite/gdb.perf/gmonster1-select-file.exp index 35c4f8bdc1d..c639cc8649e 100644 --- a/gdb/testsuite/gdb.perf/gmonster1-select-file.exp +++ b/gdb/testsuite/gdb.perf/gmonster1-select-file.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster1.exp make_testcase_config gmonster-select-file.py GmonsterSelectFile diff --git a/gdb/testsuite/gdb.perf/gmonster1.exp b/gdb/testsuite/gdb.perf/gmonster1.exp index 1b18a635259..d4d73024c84 100644 --- a/gdb/testsuite/gdb.perf/gmonster1.exp +++ b/gdb/testsuite/gdb.perf/gmonster1.exp @@ -36,9 +36,7 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests if ![info exists MONSTER] { set MONSTER "n" diff --git a/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp b/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp index e8b54b3e7aa..41724e13843 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-null-lookup.exp @@ -20,8 +20,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-null-lookup.py NullLookup diff --git a/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp b/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp index 1b36e612af7..1da2b7fdc32 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-pervasive-typedef.exp @@ -21,8 +21,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-pervasive-typedef.py PervasiveTypedef diff --git a/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp b/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp index 52b5cfac949..bf635ef55e6 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-print-cerr.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-print-cerr.py PrintCerr diff --git a/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp b/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp index b7543683d5b..957fcaa20ab 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-ptype-string.exp @@ -20,8 +20,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-ptype-string.py GmonsterPtypeString diff --git a/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp b/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp index 04867226623..db940e178e3 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-runto-main.exp @@ -19,8 +19,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-runto-main.py GmonsterRuntoMain diff --git a/gdb/testsuite/gdb.perf/gmonster2-select-file.exp b/gdb/testsuite/gdb.perf/gmonster2-select-file.exp index 1d7eecf0186..8da84bee675 100644 --- a/gdb/testsuite/gdb.perf/gmonster2-select-file.exp +++ b/gdb/testsuite/gdb.perf/gmonster2-select-file.exp @@ -20,8 +20,6 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests GenPerfTest::standard_run_driver gmonster2.exp make_testcase_config gmonster-select-file.py GmonsterSelectFile diff --git a/gdb/testsuite/gdb.perf/gmonster2.exp b/gdb/testsuite/gdb.perf/gmonster2.exp index 60da23fb710..abbfdd7b3e2 100644 --- a/gdb/testsuite/gdb.perf/gmonster2.exp +++ b/gdb/testsuite/gdb.perf/gmonster2.exp @@ -36,9 +36,7 @@ load_lib perftest.exp load_lib gen-perf-test.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests if ![info exists MONSTER] { set MONSTER "n" diff --git a/gdb/testsuite/gdb.perf/single-step.exp b/gdb/testsuite/gdb.perf/single-step.exp index 288c4b3050e..b6f936ed0be 100644 --- a/gdb/testsuite/gdb.perf/single-step.exp +++ b/gdb/testsuite/gdb.perf/single-step.exp @@ -19,9 +19,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/skip-command.exp b/gdb/testsuite/gdb.perf/skip-command.exp index 447fbcb2972..d180158dc60 100644 --- a/gdb/testsuite/gdb.perf/skip-command.exp +++ b/gdb/testsuite/gdb.perf/skip-command.exp @@ -25,9 +25,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .cc skip-funcs.cc set executable $testfile diff --git a/gdb/testsuite/gdb.perf/skip-prologue.exp b/gdb/testsuite/gdb.perf/skip-prologue.exp index 01ae6547806..80aa668d5a2 100644 --- a/gdb/testsuite/gdb.perf/skip-prologue.exp +++ b/gdb/testsuite/gdb.perf/skip-prologue.exp @@ -21,9 +21,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/solib.exp b/gdb/testsuite/gdb.perf/solib.exp index 93cf7ebc159..4d926bd14b3 100644 --- a/gdb/testsuite/gdb.perf/solib.exp +++ b/gdb/testsuite/gdb.perf/solib.exp @@ -24,9 +24,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .c set executable $testfile diff --git a/gdb/testsuite/gdb.perf/template-breakpoints.exp b/gdb/testsuite/gdb.perf/template-breakpoints.exp index c80b0fc17c7..09aee12a869 100644 --- a/gdb/testsuite/gdb.perf/template-breakpoints.exp +++ b/gdb/testsuite/gdb.perf/template-breakpoints.exp @@ -21,9 +21,7 @@ load_lib perftest.exp -if [skip_perf_tests] { - return 0 -} +require !skip_perf_tests standard_testfile .cc set executable $testfile