From 2ef902063590ebd7e8b8b8b4d708f6c7dc62a81d Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Thu, 29 Jun 2023 14:57:48 -0400 Subject: [PATCH] testsuite: Use -fno-report-bug in gcc.dg/plugin/ Certain downstream compilers (for example, in Fedora) default to -freport-bug. The extra output breaks the following tests. We can use -fno-report-bug to fix that. Patch verified with: $ make check RUNTESTFLAGS='--target_board=unix\{,-freport-bug\} plugin.exp' Tested x86_64-pc-linux-gnu, ok for trunk/13? gcc/testsuite/ChangeLog: * gcc.dg/plugin/crash-test-ice-sarif.c: Use -fno-report-bug. Adjust scan-sarif-file. * gcc.dg/plugin/crash-test-ice-stderr.c: Use -fno-report-bug. * gcc.dg/plugin/crash-test-write-though-null-sarif.c: Use -fno-report-bug. Adjust scan-sarif-file. * gcc.dg/plugin/crash-test-write-though-null-stderr.c: Use -fno-report-bug. --- gcc/testsuite/gcc.dg/plugin/crash-test-ice-sarif.c | 3 ++- gcc/testsuite/gcc.dg/plugin/crash-test-ice-stderr.c | 1 + .../gcc.dg/plugin/crash-test-write-though-null-sarif.c | 3 ++- .../gcc.dg/plugin/crash-test-write-though-null-stderr.c | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gcc.dg/plugin/crash-test-ice-sarif.c b/gcc/testsuite/gcc.dg/plugin/crash-test-ice-sarif.c index 3b773a9a84c..84a4347a17e 100644 --- a/gcc/testsuite/gcc.dg/plugin/crash-test-ice-sarif.c +++ b/gcc/testsuite/gcc.dg/plugin/crash-test-ice-sarif.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-fdiagnostics-format=sarif-file" } */ +/* { dg-additional-options "-fno-report-bug" } */ extern void inject_ice (void); @@ -56,7 +57,7 @@ void test_inject_ice (void) { dg-final { scan-sarif-file "\"contextRegion\": " } } { dg-final { scan-sarif-file "\"artifactLocation\": " } } { dg-final { scan-sarif-file "\"region\": " } } - { dg-final { scan-sarif-file "\"startLine\": 8" } } + { dg-final { scan-sarif-file "\"startLine\": 9" } } { dg-final { scan-sarif-file "\"startColumn\": 3" } } { dg-final { scan-sarif-file "\"endColumn\": 16" } } { dg-final { scan-sarif-file "\"message\": " } } diff --git a/gcc/testsuite/gcc.dg/plugin/crash-test-ice-stderr.c b/gcc/testsuite/gcc.dg/plugin/crash-test-ice-stderr.c index cee701b135c..0064d3bc447 100644 --- a/gcc/testsuite/gcc.dg/plugin/crash-test-ice-stderr.c +++ b/gcc/testsuite/gcc.dg/plugin/crash-test-ice-stderr.c @@ -1,4 +1,5 @@ /* { dg-do compile } */ +/* { dg-additional-options "-fno-report-bug" } */ extern void inject_ice (void); diff --git a/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-sarif.c b/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-sarif.c index 57caa20155f..83b38d2ffb5 100644 --- a/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-sarif.c +++ b/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-sarif.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-fdiagnostics-format=sarif-file" } */ +/* { dg-additional-options "-fno-report-bug" } */ extern void inject_write_through_null (void); @@ -56,7 +57,7 @@ void test_inject_write_through_null (void) { dg-final { scan-sarif-file "\"contextRegion\": " } } { dg-final { scan-sarif-file "\"artifactLocation\": " } } { dg-final { scan-sarif-file "\"region\": " } } - { dg-final { scan-sarif-file "\"startLine\": 8" } } + { dg-final { scan-sarif-file "\"startLine\": 9" } } { dg-final { scan-sarif-file "\"startColumn\": 3" } } { dg-final { scan-sarif-file "\"endColumn\": 31" } } { dg-final { scan-sarif-file "\"message\": " } } diff --git a/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-stderr.c b/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-stderr.c index 7b43e423633..a9a211a3b1f 100644 --- a/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-stderr.c +++ b/gcc/testsuite/gcc.dg/plugin/crash-test-write-though-null-stderr.c @@ -1,4 +1,5 @@ /* { dg-do compile } */ +/* { dg-additional-options "-fno-report-bug" } */ extern void inject_write_through_null (void); base-commit: 070a6bf0bdc6761ad77ac97404c98f00a7007d54 -- 2.41.0