From: Matthew Malcomson <matthew.malcomson@arm.com>
Date: Fri, 12 Apr 2019 13:15:52 +0000 (+0000)
Subject: [testsuite][arm] Update warning prune regex
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22de32a1a5d9b3e0e558aa530fc98addf022182b;p=gcc.git

[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
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d518447e86..eba43e597dc 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 247536b8312..575f0a11c87 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 0c4981c8316..829f6836b29 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