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.malcom...@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
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
