From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1bddac1b7bfso5199825ad.0 for ; Mon, 14 Aug 2023 01:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692000314; x=1692605114; h=content-disposition:mime-version:message-id:subject:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=DNae4TcBFXb3y8VZSmqrjQcHhN2IILji2mmZYrkDO+A=; b=Yq+AD9BoOyRhI4Gd8oS8doCirgHlV7tmzbdDp6Qj3UZ9C+nUMbH0ZuoMi2mEcXCWdc DnCEFyGeF/ZOj/2IgV0f9lIllAvHtYjm498pX6GkMopWR9ehHkjDFgQjLOzYMMPcZtSy RazvMhKZRySpHwJu8tvxoGq9gjLwJp/k7h6S1W0xQNN4Nbx3mLNAnpfSztwqwIME4Wq1 3d9J7EWFvj7qoMs+2UR5Xtdxbb6mmXkltkCqcm9Yb8l/NNPrrOlJQMVvIDAKNeo0OsMD hyIbhmc+h4zRliroQEhjgCcKRZZdjV/HVEmxHuEKPOF5Kt5GCKABlKn9VXpK9FP5s8Vx 5aeg== 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-Google-Smtp-Source: AGHT+IEHIggHxjmZacz7vJuzF9Uy94RQCSlENXwXdo4+dIDWE9Fuoyi2TiUS7nFZH1oNI/EvjOMXBA== 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 From: Alan Modra To: binutils@sourceware.org Subject: Remove fall-back prune_warnings Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 List-Id: 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 # -- Alan Modra Australia Development Lab, IBM