diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2021-04-16 11:58:17 +0100 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@arm.com> | 2021-04-16 11:58:17 +0100 |
| commit | 69e7f04ff677d5e402f937b23422567c10243ee9 (patch) | |
| tree | 4e397902ab6e0a75df2e69d64d54e2a7ff83b212 | |
| parent | b44ab138b7d4aaa5a9ee7956121ffc94777f6a42 (diff) | |
| download | gcc-69e7f04ff677d5e402f937b23422567c10243ee9.zip gcc-69e7f04ff677d5e402f937b23422567c10243ee9.tar.gz gcc-69e7f04ff677d5e402f937b23422567c10243ee9.tar.bz2 | |
arm: Fix some testsuite fallout from r11-8168 [PR100067]
Commit r11-8168 changed the word ordering of a warning in order to
make the text more consistent. Unfortunately, it neglected to update
some filters in the testsuite that are intended to strip such warnings
when we try to partially override the user-supplied command-line
options.
This patch rectifies this and also fixes some patterns that were
incorrectly specified in the first place.
gcc/testsuite:
PR target/100067
* g++.target/arm/arm.exp (dg_runtest_extra_prunes): Update prune
template.
* gcc.target/arm/arm.exp (dg_runtest_extra_prunes): Likewise.
* g++.target/arm/mve.exp (dg_runtest_extra_prunes): Likewise. Fix
missing quotes around switch names.
* gcc.target/arm/mve/mve.exp: (dg_runtest_extra_prunes): Likewise.
| -rw-r--r-- | gcc/testsuite/g++.target/arm/arm.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.target/arm/mve.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/arm/arm.exp | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/arm/mve/mve.exp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp index 182c1e9..7d873a4 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 switch '-m(cpu|arch)=.*'" # Initialize `dg'. dg-init diff --git a/gcc/testsuite/g++.target/arm/mve.exp b/gcc/testsuite/g++.target/arm/mve.exp index 82cf928..ed62561 100644 --- a/gcc/testsuite/g++.target/arm/mve.exp +++ b/gcc/testsuite/g++.target/arm/mve.exp @@ -33,7 +33,7 @@ if ![info exists DEFAULT_CXXFLAGS] 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 switch '-m(cpu|arch)=.*'" set save-dg-do-what-default ${dg-do-what-default} set dg-do-what-default "assemble" diff --git a/gcc/testsuite/gcc.target/arm/arm.exp b/gcc/testsuite/gcc.target/arm/arm.exp index d306573..4d7c2ad 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 switch '-m(cpu|arch)=.*'" # Initialize `dg'. dg-init diff --git a/gcc/testsuite/gcc.target/arm/mve/mve.exp b/gcc/testsuite/gcc.target/arm/mve/mve.exp index f8590bf..d09fc27 100644 --- a/gcc/testsuite/gcc.target/arm/mve/mve.exp +++ b/gcc/testsuite/gcc.target/arm/mve/mve.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 switch '-m(cpu|arch)=.*'" set dg-do-what-default "assemble" |