From patchwork Mon Aug 14 08:05:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 135190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2590138vqi; Mon, 14 Aug 2023 01:05:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFSGEfsPfeMw2Vi8Tc/ZeYVc+yFP1a4rH0DkBi3LYt4xC9ng9cUhXj0yXAavAP02xAs6t3g X-Received: by 2002:aa7:d987:0:b0:525:6d74:7120 with SMTP id u7-20020aa7d987000000b005256d747120mr284079eds.17.1692000327081; Mon, 14 Aug 2023 01:05:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692000327; cv=none; d=google.com; s=arc-20160816; b=WbZTsEQNdLQJsCvIfzpOURPt7PJp8FVUb2sZj5WE//yxSLEKr9ZACpjrfBRtQ0LPtl wjMAaD5mmR+xtlSLuBYexokbsK1K8zsVAgEMB8aM3D5Uyo18Gav4BZI0Oj3+twmPiYhC MxQOrf7ribbvgvbCAmRURQ1P4Rct/Gv8yC9quE7tOue3vro9l1uWqa2Q69exvHxpeakY Rie+Rkv+7Piwt7bWWFH115JqSmtfVko04os8Hkd3MecugzcXyt/3GBIDW2jq8mI33lv7 jFND/CmHFE4phV0J4b73hs1fcyxedVZy0kNbMdzuf8+mIGrb48+uGD8vwq0toC7WA0bP +Xxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-disposition:mime-version:message-id:subject:to:date :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=DNae4TcBFXb3y8VZSmqrjQcHhN2IILji2mmZYrkDO+A=; fh=HNIqzTA9Dp00ovCAyCdXfuEvWDT00OlFxFRPLybXRis=; b=b4C7bFmnxgUe0jnAb8eoEC2rpG8EA40H+LcmKDzsfWYwhBxxXHL2YexF96nAWhPDjK 9gWwQ0O4YfdZSHZ2pcHSFx+B3uh/zvZp5KmB6YewtOSTCpgXbgXAvKTKMfaPqWZD/iv/ hpHm9rPooxIvXvEyL8iCs+YJpUNJkM8K9grvNH88KvHnWRZjT2RoOWjpaeedLPQ2WbQG 7j2260yHenNERoFpV3427TQyUSFTj84ziXe3B6lQyrBSr5LauIjBBfdRGGUUobpFiH0w HqMO2HCIRNp7I6bmH3Hk5A6AoxaeIr5DgPy/4ZxjZKibiWG6yZg+IZW/YWyHwXqvDo13 v4SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=vLl21Gvh; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w11-20020aa7cb4b000000b0052540795571si3751824edt.363.2023.08.14.01.05.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 01:05:27 -0700 (PDT) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=vLl21Gvh; spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CE953858C1F for ; Mon, 14 Aug 2023 08:05:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CE953858C1F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692000324; bh=DNae4TcBFXb3y8VZSmqrjQcHhN2IILji2mmZYrkDO+A=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vLl21Gvh4pbZ1ZmMQRp8afjZBC/GGD52ItMCCPUqRMbWIasyhqEXVL5qeD84HkwIL dZQGD9v4Q1B2F0nzz7kEik6Jsh/+DlsoBaRR9SvIAGm+GPLMck1G1RBvqcwB+2MvHs KWFkzfzi83fejNGj+y4OguzYQoSyUB6x9H0TA3nY= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id 0FCAB3858D39 for ; Mon, 14 Aug 2023 08:05:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0FCAB3858D39 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1bddac1b7bfso5199825ad.0 for ; Mon, 14 Aug 2023 01:05:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692000314; x=1692605114; h=content-disposition:mime-version:message-id:subject:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DNae4TcBFXb3y8VZSmqrjQcHhN2IILji2mmZYrkDO+A=; b=aV1Zy0kRkjK/AMUm9FC0ASd+razIMKZw/LAi7oqu66+i2uDkOcoSr6qI+Y5MPq9kJG QnqrZDGmM+n/g/Ssme4ICQ91IsQI4NgcSVhnddWg734NzteRh6NeK9rQSsnUDUYrsGvZ wlgUPwj3PVNMvmJbSjpSz4BYtc92ZjNq7gvk/xAcgEdSZk+WNlYJ72PwC9SKUFBroeh5 vA/myacOc73+3Qp7XjRG9RCrLHA0xaySPQpCbQ17j4b9piZRKeZ8Pqrr2jMe225gRO46 ywOzQJ/GnLyt+Iq41+tGyQAaKo6Fa9j1+mkyYis9nlCzXytBzUCet7cCoC74xtq2ZTY2 2NrA== X-Gm-Message-State: AOJu0Yxj+JpQDFzP5f+Tzb6bXFQto5xCAz1hVY5QGDYyJTvHTpz5LqPe PbmkGiUPgHWxrownfdNx9hkyUCYSQlQ= X-Received: by 2002:a17:902:d2c2:b0:1bc:17ab:8d68 with SMTP id n2-20020a170902d2c200b001bc17ab8d68mr16472320plc.16.1692000314472; Mon, 14 Aug 2023 01:05:14 -0700 (PDT) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:5b3b:287:2751:579d]) by smtp.gmail.com with ESMTPSA id r2-20020a170902be0200b001bb9883714dsm8761455pls.143.2023.08.14.01.05.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 01:05:13 -0700 (PDT) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 38BFD11424B1; Mon, 14 Aug 2023 17:35:11 +0930 (ACST) Date: Mon, 14 Aug 2023 17:35:11 +0930 To: binutils@sourceware.org Subject: Remove fall-back prune_warnings Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3033.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alan Modra via Binutils From: Alan Modra Reply-To: Alan Modra Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774190935053831650 X-GMAIL-MSGID: 1774190935053831650 No one should be using versions of dejagnu without prune_warnings, which was available in 1996 (dejagnu-1.3). binutils/ * testsuite/lib/binutils-common.exp: Remove fallback prune_warnings. gas/ * testsuite/lib/gas-defs.exp: Remove fallback prune_warnings. diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index 7e6bf16ee6e..b944d0af3bc 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -672,28 +672,7 @@ proc prune_warnings_extra { text } { return $text } -# This definition is taken from an unreleased version of DejaGnu. Once -# that version gets released, and has been out in the world for a few -# months at least, it may be safe to delete this copy. -if ![string length [info proc prune_warnings]] { - # - # prune_warnings -- delete various system verbosities from TEXT - # - # An example is: - # ld.so: warning: /usr/lib/libc.so.1.8.1 has older revision than expected 9 - # - # Sites with particular verbose os's may wish to override this in site.exp. - # - proc prune_warnings { text } { - # This is from sun4's. Do it for all machines for now. - # The "\\1" is to try to preserve a "\n" but only if necessary. - regsub -all "(^|\n)(ld.so: warning:\[^\n\]*\n?)+" $text "\\1" text - # It might be tempting to get carried away and delete blank lines, etc. - # Just delete *exactly* what we're ask to, and that's it. - set text [prune_warnings_extra $text] - return $text - } -} elseif { [info procs saved-prune_warnings] == [list] } { +if { [info procs saved-prune_warnings] == [list] } { rename prune_warnings saved-prune_warnings proc prune_warnings { text } { set text [saved-prune_warnings $text] diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp index 3e134ca8fa0..dbd35e9cb56 100644 --- a/gas/testsuite/lib/gas-defs.exp +++ b/gas/testsuite/lib/gas-defs.exp @@ -357,32 +357,9 @@ proc verbose_eval { expr { level 1 } } { if $verbose>$level then { eval verbose "$expr" $level } } -# This definition is taken from an unreleased version of DejaGnu. Once -# that version gets released, and has been out in the world for a few -# months at least, it may be safe to delete this copy. - if { [istarget loongarch*-*-*] } { rename prune_warnings prune_warnings_other } -if ![string length [info proc prune_warnings]] { - # - # prune_warnings -- delete various system verbosities from TEXT. - # - # An example is: - # ld.so: warning: /usr/lib/libc.so.1.8.1 has older revision than expected 9 - # - # Sites with particular verbose os's may wish to override this in site.exp. - # - proc prune_warnings { text } { - # This is from sun4's. Do it for all machines for now. - # The "\\1" is to try to preserve a "\n" but only if necessary. - regsub -all "(^|\n)(ld.so: warning:\[^\n\]*\n?)+" $text "\\1" text - - # It might be tempting to get carried away and delete blank lines, etc. - # Just delete *exactly* what we're ask to, and that's it. - return $text - } -} # run_list_test NAME (optional): OPTS TESTNAME #