aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMatthew Malcomson <matthew.malcomson@arm.com>2019-04-12 13:15:52 +0000
committerMatthew Malcomson <matmal01@gcc.gnu.org>2019-04-12 13:15:52 +0000
commit22de32a1a5d9b3e0e558aa530fc98addf022182b (patch)
tree4290ef7f010f999704d3c750d5b5be2f9ea20d89 /gcc
parenta164374ef13853b25de2ad205d765fe8200bf128 (diff)
downloadgcc-22de32a1a5d9b3e0e558aa530fc98addf022182b.zip
gcc-22de32a1a5d9b3e0e558aa530fc98addf022182b.tar.gz
gcc-22de32a1a5d9b3e0e558aa530fc98addf022182b.tar.bz2
[testsuite][arm] Update warning prune regex
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-12 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. From-SVN: r270316
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.target/arm/arm.exp2
-rw-r--r--gcc/testsuite/gcc.target/arm/arm.exp2
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d51844..eba43e5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-04-12 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.
+
2019-04-12 Martin Liska <mliska@suse.cz>
PR middle-end/89970
diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
index 247536b..575f0a1 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 0c4981c..829f683 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