From patchwork Fri May 28 12:38:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1485232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fs43S6RpBz9sVb for ; Fri, 28 May 2021 22:38:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B076B398B14C; Fri, 28 May 2021 12:38:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067051.outbound.protection.outlook.com [40.92.67.51]) by sourceware.org (Postfix) with ESMTPS id 5852B3987C3B for ; Fri, 28 May 2021 12:38:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5852B3987C3B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=hotmail.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bernd.edlinger@hotmail.de ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aNUuH5/Jsm6zEJ98bCEj+smpIbL6Uyt/oB/tRq9X1jrhjYkMWWxntboL2nKjYJaq9qpydDpBASMP4eMpCqh96w1cr39hRyexWudNt94pbIGt8r8rv6xGvxTu8kRgOS6ww8ct/h9wPPCON+Nnlrofl5QDYULu/k8jB1ivIQ71pikZ09qT/7RdnBiLf9EbWe4uQ1eNPHcPBEdvWM8bCAqSWY1VfrRzEMzr70XQoz1MWBFpG4q8+pQxzR8BgiefFhG9LoxpTjgHJoAOpywcNdbQCOpZg3gJ2y3yMq6qDF3It765nLzyQAmOZv20JOGzkrlt83VkJfme/4DlBLh9ltONEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dpnDs46JmU6gilfewo41M8zsvPmMInn2KpWd1av08c4=; b=FAfB+2S30vTufTcJ2jBnVAhu9PG+7YuezVKON7CJ9WN4Zd9qklP5A0Mdr/SIdFmXLBDnpz1ZVQbIkeHGTZDqSBdsnpuTr4Mjk48g920lT0LvIG3JDlIsC6rQ3EL0U0qad+ZvN6qC677OGmcIcCxzwTmLZzo/ocnxvP/NrlTdCIpu6pi/A09pX35cn1hdeI2Uhn6MM3lTsqX7E4Hqf5lHc81P5eO85W+0rRRAg4/1QRP0xLZiHq4MUsEgGIN+Qjy07hpJAQ77JLo03YbbNRDBTfSjHslNIGyz3mU33yTGOyY0G4OkjQCv0zquuhsU4aOcZRUImG6amClLh8TAUQZBtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from HE1EUR02FT039.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02HT177.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::313) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.30; Fri, 28 May 2021 12:38:03 +0000 Received: from AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM (2a01:111:e400:7e1d::51) by HE1EUR02FT039.mail.protection.outlook.com (2a01:111:e400:7e1d::478) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.30 via Frontend Transport; Fri, 28 May 2021 12:38:03 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5CF544F602F755C326F9FD5806E60F7C0953F19ECC28952CB1240B58DD5015F3; UpperCasedChecksum:3C69AE83D229AB8DB9177CE4C2CCBE072E15D4A31401ECF0EF4741A2DFD5FD3A; SizeAsReceived:7680; Count:44 Received: from AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM ([fe80::ad12:6a2c:b949:f65d]) by AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM ([fe80::ad12:6a2c:b949:f65d%5]) with mapi id 15.20.4173.020; Fri, 28 May 2021 12:38:03 +0000 To: "gcc-patches@gcc.gnu.org" , David Malcolm From: Bernd Edlinger Subject: [PATCH] diagnostics: Fix sporadic test failure Message-ID: Date: Fri, 28 May 2021 14:38:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 Content-Language: en-US X-TMN: [xkYOCTJIQ21KIfbXTXeIGyTrzneQnCev] X-ClientProxiedBy: PR2P264CA0040.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::28) To AM8PR10MB4708.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:364::23) X-Microsoft-Original-Message-ID: <32dbfdba-7d8c-6234-6c3a-3a3e1a53cb91@hotmail.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.1.101] (84.57.61.94) by PR2P264CA0040.FRAP264.PROD.OUTLOOK.COM (2603:10a6:101:1::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Fri, 28 May 2021 12:38:02 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 44 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 2d06844d-dc05-4504-26cf-08d921d56f28 X-MS-TrafficTypeDiagnostic: HE1EUR02HT177: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KZNPWrs+Eg+dTyas4qNRtvA9TDrnDUCQfRJbizTLgdiUiXzpN6nNo3wpWS1oPAnk0vNOICerZSxE0KmFlBHjqSMhybqDTCyLZ0+SpW0Adr859S8tt3wnPC6NyiQFhXEH8vM+7FbbdVFV88g90t9Y6ELBJMtBwqQ0e1iNzpebcMDPk37R30wZRF8JAxYecZKp5WJZL7io+Zi/8YGsOdQuxa1fcUQE8tFv7yyJYFxTiySsfo69SWMpQzSPADK3RLijiEKe74CftpqNIfXnE/pv7v6tgNlAJIuWKTqmRC7tWKw+OyeVlf3KU7s9Ez57imgaZVdAmEDZtRYQ9MRILafOIR21ax84DmUsOskeBV8dLRjCLd6p9/O0J8ziEpUEsTauYYtLv4ThOQEgizD/Ik7gzw== X-MS-Exchange-AntiSpam-MessageData: tP8KafViT85jn1bcLKxfMjcztkZBLY7B1+fCZ4S+3m8NCDU2uULmS6JHCJxJi556Ni73DjNr06j6hKCQJctYZNH2McqH1C0TSE3koMg5SvPUANWLLVPszF/Pe1OFpX5IbAZwI+yV0NgVTJ6BPMG7+w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d06844d-dc05-4504-26cf-08d921d56f28 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2021 12:38:03.5378 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT039.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT177 X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00, FORGED_MUA_MOZILLA, FREEMAIL_FROM, GIT_PATCH_0, KAM_ASCII_DIVIDERS, KAM_DMARC_STATUS, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, it turns out to be reproducible this way: COLUMNS=80 make check-gcc-c RUNTESTFLAGS="plugin.exp=diagnostic*" Running /home/ed/gnu/gcc-trunk/gcc/testsuite/gcc.dg/plugin/plugin.exp ... FAIL: gcc.dg/plugin/diagnostic-test-expressions-1.c -fplugin=./diagnostic_plugin_test_tree_expression_range.so 1 blank line(s) in output FAIL: gcc.dg/plugin/diagnostic-test-expressions-1.c -fplugin=./diagnostic_plugin_test_tree_expression_range.so expected multiline pattern lines 550-551 not found: " __builtin_types_compatible_p \(long, int\) \+ f \(i\)\);.*\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\^~~~~~~\n" FAIL: gcc.dg/plugin/diagnostic-test-expressions-1.c -fplugin=./diagnostic_plugin_test_tree_expression_range.so (test for excess errors) a lot more errors happen with COLUMNS=20. Tested on x86_64-pc-linux-gnu. Is it OK for trunk? Thanks Bernd. 2021-05-28 Bernd Edlinger * gcc.dg/plugin/diagnostic_plugin_show_trees.c (plugin_init): Fix caret_max_with. * gcc.dg/plugin/diagnostic_plugin_test_inlining.c (plugin_init): Likewise. * gcc.dg/plugin/diagnostic_plugin_test_paths.c (plugin_init): Likewise. * gcc.dg/plugin/diagnostic_plugin_test_string_literals.c (plugin_init): Likewise. * gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c (plugin_init): Likewise. From 50420cb535560ec1388d34c2d3d2a3f0d339a132 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Fri, 28 May 2021 14:26:02 +0200 Subject: [PATCH] diagnostics: Fix sporadic test failure it turns out to be reproducible this way: COLUMNS=80 make check-gcc-c RUNTESTFLAGS="plugin.exp=diagnostic*" Running /home/ed/gnu/gcc-trunk/gcc/testsuite/gcc.dg/plugin/plugin.exp ... FAIL: gcc.dg/plugin/diagnostic-test-expressions-1.c -fplugin=./diagnostic_plugin_test_tree_expression_range.so 1 blank line(s) in output FAIL: gcc.dg/plugin/diagnostic-test-expressions-1.c -fplugin=./diagnostic_plugin_test_tree_expression_range.so expected multiline pattern lines 550-551 not found: " __builtin_types_compatible_p \(long, int\) \+ f \(i\)\);.*\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\^~~~~~~\n" FAIL: gcc.dg/plugin/diagnostic-test-expressions-1.c -fplugin=./diagnostic_plugin_test_tree_expression_range.so (test for excess errors) a lot more errors happen with COLUMNS=20. 2021-05-28 Bernd Edlinger * gcc.dg/plugin/diagnostic_plugin_show_trees.c (plugin_init): Fix caret_max_with. * gcc.dg/plugin/diagnostic_plugin_test_inlining.c (plugin_init): Likewise. * gcc.dg/plugin/diagnostic_plugin_test_paths.c (plugin_init): Likewise. * gcc.dg/plugin/diagnostic_plugin_test_string_literals.c (plugin_init): Likewise. * gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c (plugin_init): Likewise. --- gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c | 2 ++ gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c | 2 ++ gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c | 2 ++ gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c | 2 ++ .../gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c | 2 ++ 5 files changed, 10 insertions(+) diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c index 71e6740..ac72503 100644 --- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c +++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_show_trees.c @@ -115,6 +115,8 @@ plugin_init (struct plugin_name_args *plugin_info, if (!plugin_default_version_check (version, &gcc_version)) return 1; + global_dc->caret_max_width = 80; + register_callback (plugin_name, PLUGIN_PRE_GENERICIZE, callback, diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c index 49b78cc..02c4629 100644 --- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c +++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_inlining.c @@ -169,6 +169,8 @@ plugin_init (struct plugin_name_args *plugin_info, if (!plugin_default_version_check (version, &gcc_version)) return 1; + global_dc->caret_max_width = 80; + pass_info.pass = new pass_test_inlining (g); pass_info.reference_pass_name = "*warn_function_noreturn"; pass_info.ref_pass_instance_number = 1; diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c index 7672875..5c2da02 100644 --- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c +++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_paths.c @@ -450,6 +450,8 @@ plugin_init (struct plugin_name_args *plugin_info, if (!plugin_default_version_check (version, &gcc_version)) return 1; + global_dc->caret_max_width = 80; + pass_info.pass = make_pass_test_show_path (g); pass_info.reference_pass_name = "whole-program"; pass_info.ref_pass_instance_number = 1; diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c index cf99697..aa73dca 100644 --- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c +++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_string_literals.c @@ -208,6 +208,8 @@ plugin_init (struct plugin_name_args *plugin_info, if (!plugin_default_version_check (version, &gcc_version)) return 1; + global_dc->caret_max_width = 80; + pass_info.pass = new pass_test_string_literals (g); pass_info.reference_pass_name = "ssa"; pass_info.ref_pass_instance_number = 1; diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c index 89cc95a..4a89d84 100644 --- a/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c +++ b/gcc/testsuite/gcc.dg/plugin/diagnostic_plugin_test_tree_expression_range.c @@ -89,6 +89,8 @@ plugin_init (struct plugin_name_args *plugin_info, if (!plugin_default_version_check (version, &gcc_version)) return 1; + global_dc->caret_max_width = 130; + register_callback (plugin_name, PLUGIN_PRE_GENERICIZE, callback, -- 1.9.1