From patchwork Wed Apr 12 14:44:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67678 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 E18083857701 for ; Wed, 12 Apr 2023 14:45:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E18083857701 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681310711; bh=SAoLSZEkz6FcL/HJtuGfB62cRuu8KmPyKkCaNw2bfS0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=cMsh3V2wbl07BV0oVDAgmIHQy3noYb3Ygyu6b7+27JZGAxpzisPQrVxb4S0ePZqLV Obyq5jCXDfQadis7s8YAiJTbUnMu2Wcky0znQjNws54wbDv/14YVJFRScCtx0QXOJq yMrcyYhDcYFnYRg5gmPLwVRsoSWGPC9vRQXv1ABA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by sourceware.org (Postfix) with ESMTPS id 041A43858D28 for ; Wed, 12 Apr 2023 14:44:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 041A43858D28 Received: by mail-il1-x130.google.com with SMTP id a4so5764419ilj.10 for ; Wed, 12 Apr 2023 07:44:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681310688; x=1683902688; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SAoLSZEkz6FcL/HJtuGfB62cRuu8KmPyKkCaNw2bfS0=; b=gp11oQHiLcHh04754pFOglfl2vIboLeP6OlMFdXm11s7l7URJXGU5R+zMS/c2qmHRo GwhlVAmC/wIz6u1kEyXJKM1ayI53J1vmik2BLQ+Mdcfm4vrdB+jaiq0p1zH2chlPimzK 6ttJLF9pzMGguKbCFD32OSgT9xQv9gXTai/Donf7koLPZ/dvCmO8vDxwMVpuqz84yE3a r9R1m9h3NPgMozCWqZekltGWSujacK3VnwgcQQAcR5xsl2ohmEAsGSLPy6QWHeyXUxdV vXyjq2E8uL0cNFd10Y3JB+ndvEWzVvcS+voGZU9umrrG/Vdc/WUErRvlxQD8dD7D833w jYXg== X-Gm-Message-State: AAQBX9e9x3pm+iUMiN9aebvWZIETE0N2pSiJUSJQTmN2bCvjVlLHS+Sb 7fO9WNbH8/S9eRZ3j53ayDNC7Gf2sU9tAZE2H0b7Qw== X-Google-Smtp-Source: AKy350YfFweYu1eTi359vOaegLGHapsmihB96CekxcBoT3zHzWOwbwdj+M+GnAHnjXbDZQbFTIvWzw== X-Received: by 2002:a92:cc52:0:b0:325:d450:7afd with SMTP id t18-20020a92cc52000000b00325d4507afdmr11523272ilq.8.1681310688233; Wed, 12 Apr 2023 07:44:48 -0700 (PDT) Received: from localhost.localdomain (75-166-159-36.hlrn.qwest.net. [75.166.159.36]) by smtp.gmail.com with ESMTPSA id p29-20020a056638191d00b0040b10c92331sm4874480jal.109.2023.04.12.07.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 07:44:47 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [pushed] Use 'require' with gnatmake_version_at_least Date: Wed, 12 Apr 2023 08:44:32 -0600 Message-Id: <20230412144432.3050609-1-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I found a couple of tests that check gnatmake_version_at_least using "if" where "require" would be a little cleaner. This patch converts these. --- gdb/testsuite/gdb.ada/mi_prot.exp | 4 +--- gdb/testsuite/gdb.ada/rename_subscript_param.exp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp index 42ca90d807b..35d2c17c470 100644 --- a/gdb/testsuite/gdb.ada/mi_prot.exp +++ b/gdb/testsuite/gdb.ada/mi_prot.exp @@ -16,10 +16,8 @@ load_lib "ada.exp" require allow_ada_tests +require {gnatmake_version_at_least 8} -if { ![gnatmake_version_at_least 8] } { - return -1 -} standard_ada_testfile prot if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \ diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp index df5c9b26982..e3209bc299b 100644 --- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp +++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp @@ -17,9 +17,7 @@ load_lib "ada.exp" require allow_ada_tests -if { ![gnatmake_version_at_least 8] } { - return -1 -} +require {gnatmake_version_at_least 8} standard_ada_testfile pb30_012