diff mbox series

[testsuite,arm] Update warning prune regex

Message ID VI1PR0801MB201416E3034406F227A9F2E9E02F0@VI1PR0801MB2014.eurprd08.prod.outlook.com
State New
Headers show
Series [testsuite,arm] Update warning prune regex | expand

Commit Message

Matthew Malcomson April 11, 2019, 9:26 a.m. UTC 
r269586 changed the format of some warning messages.

Each switch in the warning message is now surrounded by single quotes.

This commit updates the regex's in arm.exp dejagnu files to match the
new format and remove the extra 20+ FAILs on excess errors that are
introduced on certain variations (e.g.
arm-eabi-aem/-marm/-march=armv7-a/-mfpu=vfpv3-d16/-mfloat-abi=softfp).

Regtested arm.exp with cross-compiler arm-none-eabi

gcc/testsuite/ChangeLog:

2019-04-11  Matthew Malcomson  <matthew.malcomson@arm.com>

	* g++.target/arm/arm.exp: Change format of default prune regex.
	* gcc.target/arm/arm.exp: Change format of default prune regex.



###############     Attachment also inlined for ease of reply    ###############
diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
index 247536b8312f8ff7a50c0eaf66e12785b80b6d3b..575f0a11c87583a264761f705997c7efc9d2d368 100644
--- a/gcc/testsuite/g++.target/arm/arm.exp
+++ b/gcc/testsuite/g++.target/arm/arm.exp
@@ -35,7 +35,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
 
 global dg_runtest_extra_prunes
 set dg_runtest_extra_prunes ""
-lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
+lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
 
 # Initialize `dg'.
 dg-init
diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp
index 0c4981c8316a30944302220b344810e3d44fcab1..829f6836b2918acdbae3160ec48802d9fe7ab5de 100644
--- a/gcc/testsuite/gcc.target/arm/arm.exp
+++ b/gcc/testsuite/gcc.target/arm/arm.exp
@@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then {
 # This variable should only apply to tests called in this exp file.
 global dg_runtest_extra_prunes
 set dg_runtest_extra_prunes ""
-lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
+lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
 
 # Initialize `dg'.
 dg-init

Comments

Kyrill Tkachov April 11, 2019, 9:58 a.m. UTC | #1 
Hi Matthew,

On 4/11/19 10:26 AM, Matthew Malcomson wrote:
> r269586 changed the format of some warning messages.
>
> Each switch in the warning message is now surrounded by single quotes.
>
> This commit updates the regex's in arm.exp dejagnu files to match the
> new format and remove the extra 20+ FAILs on excess errors that are
> introduced on certain variations (e.g.
> arm-eabi-aem/-marm/-march=armv7-a/-mfpu=vfpv3-d16/-mfloat-abi=softfp).
>
> Regtested arm.exp with cross-compiler arm-none-eabi
>
Ok.

Thanks,

Kyrill


> gcc/testsuite/ChangeLog:
>
> 2019-04-11  Matthew Malcomson <matthew.malcomson@arm.com>
>
>         * g++.target/arm/arm.exp: Change format of default prune regex.
>         * gcc.target/arm/arm.exp: Change format of default prune regex.
>
>
>
> ###############     Attachment also inlined for ease of reply    
> ###############
>
>
> diff --git a/gcc/testsuite/g++.target/arm/arm.exp 
> b/gcc/testsuite/g++.target/arm/arm.exp
> index 
> 247536b8312f8ff7a50c0eaf66e12785b80b6d3b..575f0a11c87583a264761f705997c7efc9d2d368 
> 100644
> --- a/gcc/testsuite/g++.target/arm/arm.exp
> +++ b/gcc/testsuite/g++.target/arm/arm.exp
> @@ -35,7 +35,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
>
>  global dg_runtest_extra_prunes
>  set dg_runtest_extra_prunes ""
> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* 
> conflicts with -m(cpu|arch)=.* switch"
> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' 
> conflicts with '-m(cpu|arch)=.*' switch"
>
>  # Initialize `dg'.
>  dg-init
> diff --git a/gcc/testsuite/gcc.target/arm/arm.exp 
> b/gcc/testsuite/gcc.target/arm/arm.exp
> index 
> 0c4981c8316a30944302220b344810e3d44fcab1..829f6836b2918acdbae3160ec48802d9fe7ab5de 
> 100644
> --- a/gcc/testsuite/gcc.target/arm/arm.exp
> +++ b/gcc/testsuite/gcc.target/arm/arm.exp
> @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then {
>  # This variable should only apply to tests called in this exp file.
>  global dg_runtest_extra_prunes
>  set dg_runtest_extra_prunes ""
> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* 
> conflicts with -m(cpu|arch)=.* switch"
> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' 
> conflicts with '-m(cpu|arch)=.*' switch"
>
>  # Initialize `dg'.
>  dg-init
>
Christophe Lyon April 12, 2019, 2:16 p.m. UTC | #2 
On Thu, 11 Apr 2019 at 11:26, Matthew Malcomson
<Matthew.Malcomson@arm.com> wrote:
>
> r269586 changed the format of some warning messages.
>
> Each switch in the warning message is now surrounded by single quotes.
>
> This commit updates the regex's in arm.exp dejagnu files to match the
> new format and remove the extra 20+ FAILs on excess errors that are
> introduced on certain variations (e.g.
> arm-eabi-aem/-marm/-march=armv7-a/-mfpu=vfpv3-d16/-mfloat-abi=softfp).
>
> Regtested arm.exp with cross-compiler arm-none-eabi
>
> gcc/testsuite/ChangeLog:
>
> 2019-04-11  Matthew Malcomson  <matthew.malcomson@arm.com>
>
>         * g++.target/arm/arm.exp: Change format of default prune regex.
>         * gcc.target/arm/arm.exp: Change format of default prune regex.
>

Hi!

After you committed this, I'm now seeing errors opposite to what you describe:
FAIL: gcc.target/arm/fma.c (test for excess errors)
Excess errors:
cc1: warning: switch -mcpu=cortex-a15 conflicts with -march=armv5t switch

Is there something that can prevent emission of the quotes in the
environment for instance?

Thanks,

Christophe

>
>
> ###############     Attachment also inlined for ease of reply    ###############
>
>
> diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
> index 247536b8312f8ff7a50c0eaf66e12785b80b6d3b..575f0a11c87583a264761f705997c7efc9d2d368 100644
> --- a/gcc/testsuite/g++.target/arm/arm.exp
> +++ b/gcc/testsuite/g++.target/arm/arm.exp
> @@ -35,7 +35,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
>
>  global dg_runtest_extra_prunes
>  set dg_runtest_extra_prunes ""
> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
>
>  # Initialize `dg'.
>  dg-init
> diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp
> index 0c4981c8316a30944302220b344810e3d44fcab1..829f6836b2918acdbae3160ec48802d9fe7ab5de 100644
> --- a/gcc/testsuite/gcc.target/arm/arm.exp
> +++ b/gcc/testsuite/gcc.target/arm/arm.exp
> @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then {
>  # This variable should only apply to tests called in this exp file.
>  global dg_runtest_extra_prunes
>  set dg_runtest_extra_prunes ""
> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
>
>  # Initialize `dg'.
>  dg-init
>
Christophe Lyon April 12, 2019, 2:19 p.m. UTC | #3 
On Fri, 12 Apr 2019 at 16:16, Christophe Lyon
<christophe.lyon@linaro.org> wrote:
>
> On Thu, 11 Apr 2019 at 11:26, Matthew Malcomson
> <Matthew.Malcomson@arm.com> wrote:
> >
> > r269586 changed the format of some warning messages.
> >
> > Each switch in the warning message is now surrounded by single quotes.
> >
> > This commit updates the regex's in arm.exp dejagnu files to match the
> > new format and remove the extra 20+ FAILs on excess errors that are
> > introduced on certain variations (e.g.
> > arm-eabi-aem/-marm/-march=armv7-a/-mfpu=vfpv3-d16/-mfloat-abi=softfp).
> >
> > Regtested arm.exp with cross-compiler arm-none-eabi
> >
> > gcc/testsuite/ChangeLog:
> >
> > 2019-04-11  Matthew Malcomson  <matthew.malcomson@arm.com>
> >
> >         * g++.target/arm/arm.exp: Change format of default prune regex.
> >         * gcc.target/arm/arm.exp: Change format of default prune regex.
> >
>
> Hi!
>
> After you committed this, I'm now seeing errors opposite to what you describe:
> FAIL: gcc.target/arm/fma.c (test for excess errors)
> Excess errors:
> cc1: warning: switch -mcpu=cortex-a15 conflicts with -march=armv5t switch
>
> Is there something that can prevent emission of the quotes in the
> environment for instance?
>

Sorry for the noise, I noticed too late that you committed this in
gcc-8-branch by mistake, then reverted.

> Thanks,
>
> Christophe
>
> >
> >
> > ###############     Attachment also inlined for ease of reply    ###############
> >
> >
> > diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
> > index 247536b8312f8ff7a50c0eaf66e12785b80b6d3b..575f0a11c87583a264761f705997c7efc9d2d368 100644
> > --- a/gcc/testsuite/g++.target/arm/arm.exp
> > +++ b/gcc/testsuite/g++.target/arm/arm.exp
> > @@ -35,7 +35,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
> >
> >  global dg_runtest_extra_prunes
> >  set dg_runtest_extra_prunes ""
> > -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
> > +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
> >
> >  # Initialize `dg'.
> >  dg-init
> > diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp
> > index 0c4981c8316a30944302220b344810e3d44fcab1..829f6836b2918acdbae3160ec48802d9fe7ab5de 100644
> > --- a/gcc/testsuite/gcc.target/arm/arm.exp
> > +++ b/gcc/testsuite/gcc.target/arm/arm.exp
> > @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then {
> >  # This variable should only apply to tests called in this exp file.
> >  global dg_runtest_extra_prunes
> >  set dg_runtest_extra_prunes ""
> > -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
> > +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
> >
> >  # Initialize `dg'.
> >  dg-init
> >
Matthew Malcomson April 12, 2019, 2:23 p.m. UTC | #4 
On 12/04/19 15:16, Christophe Lyon wrote:
> On Thu, 11 Apr 2019 at 11:26, Matthew Malcomson
> <Matthew.Malcomson@arm.com> wrote:
>>
>> r269586 changed the format of some warning messages.
>>
>> Each switch in the warning message is now surrounded by single quotes.
>>
>> This commit updates the regex's in arm.exp dejagnu files to match the
>> new format and remove the extra 20+ FAILs on excess errors that are
>> introduced on certain variations (e.g.
>> arm-eabi-aem/-marm/-march=armv7-a/-mfpu=vfpv3-d16/-mfloat-abi=softfp).
>>
>> Regtested arm.exp with cross-compiler arm-none-eabi
>>
>> gcc/testsuite/ChangeLog:
>>
>> 2019-04-11  Matthew Malcomson  <matthew.malcomson@arm.com>
>>
>>          * g++.target/arm/arm.exp: Change format of default prune regex.
>>          * gcc.target/arm/arm.exp: Change format of default prune regex.
>>
> 
> Hi!
> 
> After you committed this, I'm now seeing errors opposite to what you describe:
> FAIL: gcc.target/arm/fma.c (test for excess errors)
> Excess errors:
> cc1: warning: switch -mcpu=cortex-a15 conflicts with -march=armv5t switch
> 
> Is there something that can prevent emission of the quotes in the
> environment for instance?
> 

Hi Christophe,

I don't know of anything in the environment that could cause that, and 
will go look.


Just to check for the simple answer:

Originally I mistakenly put this patch onto the gcc-8 branch instead of 
trunk.

Since gcc-8 doesn't have the commit changing the format, you would have 
seen such reverse errors there -- is that where you're seeing them?

If that's the case I just noticed & corrected that this afternoon.

Thanks,
MM

> Thanks,
> 
> Christophe
> 
>>
>>
>> ###############     Attachment also inlined for ease of reply    ###############
>>
>>
>> diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
>> index 247536b8312f8ff7a50c0eaf66e12785b80b6d3b..575f0a11c87583a264761f705997c7efc9d2d368 100644
>> --- a/gcc/testsuite/g++.target/arm/arm.exp
>> +++ b/gcc/testsuite/g++.target/arm/arm.exp
>> @@ -35,7 +35,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
>>
>>   global dg_runtest_extra_prunes
>>   set dg_runtest_extra_prunes ""
>> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
>> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
>>
>>   # Initialize `dg'.
>>   dg-init
>> diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp
>> index 0c4981c8316a30944302220b344810e3d44fcab1..829f6836b2918acdbae3160ec48802d9fe7ab5de 100644
>> --- a/gcc/testsuite/gcc.target/arm/arm.exp
>> +++ b/gcc/testsuite/gcc.target/arm/arm.exp
>> @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then {
>>   # This variable should only apply to tests called in this exp file.
>>   global dg_runtest_extra_prunes
>>   set dg_runtest_extra_prunes ""
>> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
>> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
>>
>>   # Initialize `dg'.
>>   dg-init
>>
Christophe Lyon April 12, 2019, 2:32 p.m. UTC | #5 
On Fri, 12 Apr 2019 at 16:23, Matthew Malcomson
<Matthew.Malcomson@arm.com> wrote:
>
> On 12/04/19 15:16, Christophe Lyon wrote:
> > On Thu, 11 Apr 2019 at 11:26, Matthew Malcomson
> > <Matthew.Malcomson@arm.com> wrote:
> >>
> >> r269586 changed the format of some warning messages.
> >>
> >> Each switch in the warning message is now surrounded by single quotes.
> >>
> >> This commit updates the regex's in arm.exp dejagnu files to match the
> >> new format and remove the extra 20+ FAILs on excess errors that are
> >> introduced on certain variations (e.g.
> >> arm-eabi-aem/-marm/-march=armv7-a/-mfpu=vfpv3-d16/-mfloat-abi=softfp).
> >>
> >> Regtested arm.exp with cross-compiler arm-none-eabi
> >>
> >> gcc/testsuite/ChangeLog:
> >>
> >> 2019-04-11  Matthew Malcomson  <matthew.malcomson@arm.com>
> >>
> >>          * g++.target/arm/arm.exp: Change format of default prune regex.
> >>          * gcc.target/arm/arm.exp: Change format of default prune regex.
> >>
> >
> > Hi!
> >
> > After you committed this, I'm now seeing errors opposite to what you describe:
> > FAIL: gcc.target/arm/fma.c (test for excess errors)
> > Excess errors:
> > cc1: warning: switch -mcpu=cortex-a15 conflicts with -march=armv5t switch
> >
> > Is there something that can prevent emission of the quotes in the
> > environment for instance?
> >
>
> Hi Christophe,
>
> I don't know of anything in the environment that could cause that, and
> will go look.
>
>
> Just to check for the simple answer:
>
> Originally I mistakenly put this patch onto the gcc-8 branch instead of
> trunk.
>
> Since gcc-8 doesn't have the commit changing the format, you would have
> seen such reverse errors there -- is that where you're seeing them?
>
> If that's the case I just noticed & corrected that this afternoon.
>
Indeed, sorry I didn't have time enough this morning to report the
problem earlier.

Thanks,

Christophe

> Thanks,
> MM
>
> > Thanks,
> >
> > Christophe
> >
> >>
> >>
> >> ###############     Attachment also inlined for ease of reply    ###############
> >>
> >>
> >> diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
> >> index 247536b8312f8ff7a50c0eaf66e12785b80b6d3b..575f0a11c87583a264761f705997c7efc9d2d368 100644
> >> --- a/gcc/testsuite/g++.target/arm/arm.exp
> >> +++ b/gcc/testsuite/g++.target/arm/arm.exp
> >> @@ -35,7 +35,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
> >>
> >>   global dg_runtest_extra_prunes
> >>   set dg_runtest_extra_prunes ""
> >> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
> >> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
> >>
> >>   # Initialize `dg'.
> >>   dg-init
> >> diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp
> >> index 0c4981c8316a30944302220b344810e3d44fcab1..829f6836b2918acdbae3160ec48802d9fe7ab5de 100644
> >> --- a/gcc/testsuite/gcc.target/arm/arm.exp
> >> +++ b/gcc/testsuite/gcc.target/arm/arm.exp
> >> @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CFLAGS] then {
> >>   # This variable should only apply to tests called in this exp file.
> >>   global dg_runtest_extra_prunes
> >>   set dg_runtest_extra_prunes ""
> >> -lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
> >> +lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
> >>
> >>   # Initialize `dg'.
> >>   dg-init
> >>
>
diff mbox series

Patch

diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
index 247536b8312f8ff7a50c0eaf66e12785b80b6d3b..575f0a11c87583a264761f705997c7efc9d2d368 100644
--- a/gcc/testsuite/g++.target/arm/arm.exp
+++ b/gcc/testsuite/g++.target/arm/arm.exp
@@ -35,7 +35,7 @@  if ![info exists DEFAULT_CXXFLAGS] then {
 
 global dg_runtest_extra_prunes
 set dg_runtest_extra_prunes ""
-lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
+lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
 
 # Initialize `dg'.
 dg-init
diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp
index 0c4981c8316a30944302220b344810e3d44fcab1..829f6836b2918acdbae3160ec48802d9fe7ab5de 100644
--- a/gcc/testsuite/gcc.target/arm/arm.exp
+++ b/gcc/testsuite/gcc.target/arm/arm.exp
@@ -33,7 +33,7 @@  if ![info exists DEFAULT_CFLAGS] then {
 # This variable should only apply to tests called in this exp file.
 global dg_runtest_extra_prunes
 set dg_runtest_extra_prunes ""
-lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
+lappend dg_runtest_extra_prunes "warning: switch '-m(cpu|arch)=.*' conflicts with '-m(cpu|arch)=.*' switch"
 
 # Initialize `dg'.
 dg-init