From patchwork Sat Mar 4 08:50:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 64183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp835874wrd; Sat, 4 Mar 2023 00:51:35 -0800 (PST) X-Google-Smtp-Source: AK7set9Jz1XM4y++RBxxx9UW2qCNxqiVJQl8FEQwsml86yOsFwXubPzbtLR/keWjyeFOg7S6CD92 X-Received: by 2002:a50:ed12:0:b0:4bb:8e88:daeb with SMTP id j18-20020a50ed12000000b004bb8e88daebmr4431362eds.31.1677919895870; Sat, 04 Mar 2023 00:51:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677919895; cv=none; d=google.com; s=arc-20160816; b=KCZoS4BGSByDtfcB0DubelXziCDxTQV/ikwwVAw8k5A2GyjEGniJvqBOzIzOfmwNhA BIzRiWWHGwSrSAyx768Tcoot4Yj7J+07Mr8mXHDdYm1aSrcyH+pAESw8/JC3pO8Fqhbm hN/18pDMK5r5F1qzzMNTYQfmXMKE6JSc9MkK0lI1B9XLpbcSKZ0NpkbDG3lSW2vKNljY no8UVTW5Yg55rAj7EATd0FB+YPcKPlQNVLlSjgtRVb0Aw+KY3+adMo18a7tYqDFZdMMM kyQKRSGW/+f5Dz6wmUR5ul2DWrN8dDe2iRG28mACJQ8nPfrBDP+9/eFPDNSm93yF+9YX LgvA== 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:in-reply-to:mime-version:references:message-id :subject:cc:to:date:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=253hOclFKm30kZobCTb1xoJ6eRO/HrurA05f6tsafgA=; b=xJwb/QvFspHGmPA73sfIX3bacFvg7WUPKxENRMjHpyVjDD6NVx2lxp2G1Fit+pGkwQ +I5b/iQtPhW2EMa8L9p3wg2Os3bJtjDAFR1G+PFAs9H/Aw7eFFk1JHZhBYp8Ptdg60Hi 0vBRS9tVi6l0aQ+JdPSb+GQMkeii1hpKzjwCMzjJdiFMV0QXmL8Hy3CMS7H524DNzTF7 Nko0pabpjH16HQsWwk4pkcCiPGEoFEmYyYiBi+0MOZ6K88F5909eCe+EICs//G2vY3w6 JHCyTgt7WctGsCY+/+Y3rKGWo904r58SIX10B0FO8ly3gke4rL0+pYZWm3lJ2JVXj2AP u2Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=IXLD+xHU; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id c8-20020aa7c988000000b004ad7c4bd9bdsi4709477edt.107.2023.03.04.00.51.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 00:51:35 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=IXLD+xHU; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E796F3857400 for ; Sat, 4 Mar 2023 08:51:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E796F3857400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677919894; bh=253hOclFKm30kZobCTb1xoJ6eRO/HrurA05f6tsafgA=; h=Date:To:Cc:Subject:References:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=IXLD+xHUt5aRBlul1fzWJjpkECsAPXktIgOqLwJiGbUdj/VJ60EyZ7ko1XXCvz4ub nAaIVmbBIWF8VsXK9vjV3OzDcXWMsaF5eROzvbw8XnKRWzDwMIDCE8y2G3kER0ITo5 OWTlnJPe0H5kBptkt7LNUeor/KcHc89Qkvk33/lM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id EE5253858D28 for ; Sat, 4 Mar 2023 08:50:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EE5253858D28 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-WI6KbAkLPvSpTjMivmpgqw-1; Sat, 04 Mar 2023 03:50:49 -0500 X-MC-Unique: WI6KbAkLPvSpTjMivmpgqw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F4048101A521 for ; Sat, 4 Mar 2023 08:50:48 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9AE29492C3E; Sat, 4 Mar 2023 08:50:48 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 3248ojGZ447681 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Sat, 4 Mar 2023 09:50:45 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 3248oirX447680; Sat, 4 Mar 2023 09:50:44 +0100 Date: Sat, 4 Mar 2023 09:50:44 +0100 To: David Malcolm Cc: gcc-patches@gcc.gnu.org Subject: [committed] diagnostics, v2: Fix up selftests with $COLUMNS < 42 [PR108973] Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jakub Jelinek via Gcc-patches From: Jakub Jelinek Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759426532632383446?= X-GMAIL-MSGID: =?utf-8?q?1759426532632383446?= On Fri, Mar 03, 2023 at 08:54:32AM -0500, David Malcolm wrote: > Thanks for working on this. > > Patch is OK, but I wonder if it would even better to just hardcode > caret_max_width as 80 here, to better eliminate that influence from > from the environment in the unit tests? I think all of the tests that > modify caret_max_width do so after the ctor has run. Thanks, here is what I've committed after another bootstrap/regtest: 2023-03-04 Jakub Jelinek PR testsuite/108973 * selftest-diagnostic.cc (test_diagnostic_context::test_diagnostic_context): Set caret_max_width to 80. Jakub --- gcc/selftest-diagnostic.cc.jj 2023-01-02 09:32:31.991146491 +0100 +++ gcc/selftest-diagnostic.cc 2023-03-02 10:05:17.974321025 +0100 @@ -41,6 +41,7 @@ test_diagnostic_context::test_diagnostic show_column = true; start_span = start_span_cb; min_margin_width = 6; + caret_max_width = 80; } test_diagnostic_context::~test_diagnostic_context ()