Hi!
On 2020-10-30T12:25:38+0100, Jakub Jelinek via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
> On Fri, Oct 30, 2020 at 12:22:31PM +0100, Thomas Schwinge wrote:
>> Turns out that GCC PR85303 "[testsuite, libgomp] dg-message not
>> supported" is the very same problem as (the libgomp aspect of) GCC
>> PR80219 "relative line numbers only working if gcc_{error,warning}_prefix
>> defined" (see rationale in there). OK to push the attached patch for
>> "libgomp testsuite: tell warning from error diagnostics, etc. [PR80219,
>> PR85303]"? This changes makes 'dg-warning', 'dg-error', 'dg-bogus',
>> 'dg-message' behave as expected, and also enables use of relative line
>> numbers as well as 'dg-line'. (No testsuite regressions.)
>
> Ok, thanks.
As posted, pushed "libgomp testsuite: tell warning from error
diagnostics, etc. [PR80219, PR85303]" to master branch in commit
528507fa0314c75d1105890e4781a475c8badd7c, and backported to
releases/gcc-10 branch in commit
591e878fc6dd08502429a8e480d8e7d966836ca9, releases/gcc-9 branch in commit
d824c5df1714403067f2a7170dd884887ce04712, releases/gcc-8 branch in commit
3940a3ff2be0b445a5b24a222e83669e570f32a9.
Grüße
Thomas
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander
Walter
>From 528507fa0314c75d1105890e4781a475c8badd7c Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Thu, 29 Oct 2020 10:29:19 +0100
Subject: [PATCH] libgomp testsuite: tell warning from error diagnostics, etc.
[PR80219, PR85303]
This changes makes 'dg-warning', 'dg-error', 'dg-bogus', 'dg-message' behave as
expected, and also enables use of relative line numbers as well as 'dg-line'.
libgomp/
PR testsuite/80219
PR testsuite/85303
* testsuite/lib/libgomp.exp (libgomp_init): Set
'gcc_warning_prefix', 'gcc_error_prefix'.
---
libgomp/testsuite/lib/libgomp.exp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 5d86e2ac095f..72d001186a57 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -241,6 +241,12 @@ proc libgomp_init { args } {
if { $offload_additional_options != "" } {
lappend ALWAYS_CFLAGS "additional_flags=${offload_additional_options}"
}
+
+ # Tell warning from error diagnostics. This fits for C, C++, and Fortran.
+ global gcc_warning_prefix
+ set gcc_warning_prefix "\[Ww\]arning:"
+ global gcc_error_prefix
+ set gcc_error_prefix "(\[Ff\]atal )?\[Ee\]rror:"
}
#
--
2.17.1
>From 591e878fc6dd08502429a8e480d8e7d966836ca9 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Thu, 29 Oct 2020 10:29:19 +0100
Subject: [PATCH] libgomp testsuite: tell warning from error diagnostics, etc.
[PR80219, PR85303]
This changes makes 'dg-warning', 'dg-error', 'dg-bogus', 'dg-message' behave as
expected, and also enables use of relative line numbers as well as 'dg-line'.
libgomp/
PR testsuite/80219
PR testsuite/85303
* testsuite/lib/libgomp.exp (libgomp_init): Set
'gcc_warning_prefix', 'gcc_error_prefix'.
(cherry picked from commit 528507fa0314c75d1105890e4781a475c8badd7c)
---
libgomp/testsuite/lib/libgomp.exp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index ee5f0e57b190..a52f83e47ade 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -243,6 +243,12 @@ proc libgomp_init { args } {
if { $offload_additional_options != "" } {
lappend ALWAYS_CFLAGS "additional_flags=${offload_additional_options}"
}
+
+ # Tell warning from error diagnostics. This fits for C, C++, and Fortran.
+ global gcc_warning_prefix
+ set gcc_warning_prefix "\[Ww\]arning:"
+ global gcc_error_prefix
+ set gcc_error_prefix "(\[Ff\]atal )?\[Ee\]rror:"
}
#
--
2.17.1
>From d824c5df1714403067f2a7170dd884887ce04712 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Thu, 29 Oct 2020 10:29:19 +0100
Subject: [PATCH] libgomp testsuite: tell warning from error diagnostics, etc.
[PR80219, PR85303]
This changes makes 'dg-warning', 'dg-error', 'dg-bogus', 'dg-message' behave as
expected, and also enables use of relative line numbers as well as 'dg-line'.
libgomp/
PR testsuite/80219
PR testsuite/85303
* testsuite/lib/libgomp.exp (libgomp_init): Set
'gcc_warning_prefix', 'gcc_error_prefix'.
(cherry picked from commit 528507fa0314c75d1105890e4781a475c8badd7c)
---
libgomp/testsuite/lib/libgomp.exp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 14d9b5f13054..bee273df3b0d 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -229,6 +229,12 @@ proc libgomp_init { args } {
if { $offload_additional_options != "" } {
lappend ALWAYS_CFLAGS "additional_flags=${offload_additional_options}"
}
+
+ # Tell warning from error diagnostics. This fits for C, C++, and Fortran.
+ global gcc_warning_prefix
+ set gcc_warning_prefix "\[Ww\]arning:"
+ global gcc_error_prefix
+ set gcc_error_prefix "(\[Ff\]atal )?\[Ee\]rror:"
}
#
--
2.17.1
>From 3940a3ff2be0b445a5b24a222e83669e570f32a9 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tho...@codesourcery.com>
Date: Thu, 29 Oct 2020 10:29:19 +0100
Subject: [PATCH] libgomp testsuite: tell warning from error diagnostics, etc.
[PR80219, PR85303]
This changes makes 'dg-warning', 'dg-error', 'dg-bogus', 'dg-message' behave as
expected, and also enables use of relative line numbers as well as 'dg-line'.
libgomp/
PR testsuite/80219
PR testsuite/85303
* testsuite/lib/libgomp.exp (libgomp_init): Set
'gcc_warning_prefix', 'gcc_error_prefix'.
(cherry picked from commit 528507fa0314c75d1105890e4781a475c8badd7c)
---
libgomp/testsuite/lib/libgomp.exp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index ea3da2cb3835..043020747326 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -248,6 +248,12 @@ proc libgomp_init { args } {
if { $offload_additional_options != "" } {
lappend ALWAYS_CFLAGS "additional_flags=${offload_additional_options}"
}
+
+ # Tell warning from error diagnostics. This fits for C, C++, and Fortran.
+ global gcc_warning_prefix
+ set gcc_warning_prefix "\[Ww\]arning:"
+ global gcc_error_prefix
+ set gcc_error_prefix "(\[Ff\]atal )?\[Ee\]rror:"
}
#
--
2.17.1
