From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 8D5CE3858D28; Sat, 4 Mar 2023 08:49:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D5CE3858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677919768; bh=8peOm3CVLDm52j6ulbgrU/xzwp1pEah7+oUHPJ11wEo=; h=From:To:Subject:Date:From; b=pQmuRL8/vOdNIH4ixQD508d0YPgqUNcPFE8KOh3G9hwDLduopSSbA/R7DFucYgrtk J+MDmWoFJqa2z5SNt57fWqOv3QKeREEvT+DaiGKgMc7V4jcn6QQnky2GejEo9epW0I 9kdYi1nghhEidfmiV/lgbqyq4nnZ720kEwyvr9nk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6472] diagnostics: Fix up selftests with $COLUMNS < 42 [PR108973] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/master X-Git-Oldrev: 53940eee08957b8b72ee70f57770398009e19c21 X-Git-Newrev: 739e7ebb3d378ece25d64b39baae47c584253498 Message-Id: <20230304084928.8D5CE3858D28@sourceware.org> Date: Sat, 4 Mar 2023 08:49:28 +0000 (GMT) List-Id: https://gcc.gnu.org/g:739e7ebb3d378ece25d64b39baae47c584253498 commit r13-6472-g739e7ebb3d378ece25d64b39baae47c584253498 Author: Jakub Jelinek Date: Sat Mar 4 09:48:17 2023 +0100 diagnostics: Fix up selftests with $COLUMNS < 42 [PR108973] As mentioned in the PR, GCC's diagnostics self-tests fail if $COLUMNS < 42. Guarding each self-test with if (get_terminal_width () > 41) or similar would be a maintainance nightmare (PR has a patch to do so without reformatting to make it work for $COLUMNS in [30, 41] inclusive, but I'm afraid going down to $COLUMNS 1 would mean marking everything). Furthermore, the self-tests don't really emit stuff to the terminal, but into a buffer, so using get_terminal_width () for it seems inappropriate. The following patch makes sure test_diagnostic_context constructor uses exactly 80 columns wide caret max width, of course some tests override it already if they want to test for behavior in narrower cases. 2023-03-04 Jakub Jelinek PR testsuite/108973 * selftest-diagnostic.cc (test_diagnostic_context::test_diagnostic_context): Set caret_max_width to 80. Diff: --- gcc/selftest-diagnostic.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/gcc/selftest-diagnostic.cc b/gcc/selftest-diagnostic.cc index 6ac9f46dd3c..6d1bd1bd792 100644 --- a/gcc/selftest-diagnostic.cc +++ b/gcc/selftest-diagnostic.cc @@ -41,6 +41,7 @@ test_diagnostic_context::test_diagnostic_context () show_column = true; start_span = start_span_cb; min_margin_width = 6; + caret_max_width = 80; } test_diagnostic_context::~test_diagnostic_context ()