From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677919850; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=253hOclFKm30kZobCTb1xoJ6eRO/HrurA05f6tsafgA=; b=F23YIGMTCjh8JBswtbZJp6rAusvd/SgJbR4KAIrSV+c0KdCSzKwsgNnBPe13LzyxJ22QL1 X5rc14TUuYH96KEpUPJvTYHeNtBjpqBBRJxdxkro8oML3ZMZQkm92L7BPkj5rho+NgieTW zEJ30Qe3GaO1HE3xMI3zWsxyXIZRCEA= 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 From: Jakub Jelinek To: David Malcolm Cc: gcc-patches@gcc.gnu.org Subject: [committed] diagnostics, v2: Fix up selftests with $COLUMNS < 42 [PR108973] Message-ID: Reply-To: Jakub Jelinek 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-Type: text/plain; charset=us-ascii 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 List-Id: 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. --- 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 () Jakub