https://gcc.gnu.org/g:89a746f2a326ae83c51868271615fe5d7e249c50
commit r15-1195-g89a746f2a326ae83c51868271615fe5d7e249c50
Author: Alexandre Oliva <ol...@adacore.com>
Date: Wed Jun 12 00:16:24 2024 -0300
[testsuite] [arm] test board cflags in multilib.exp
multilib.exp tests for multilib-altering flags in a board's
multilib_flags and skips the test, but if such flags appear in the
board's cflags, with the same distorting effects on tested multilibs,
we fail to skip the test.
Extend the skipping logic to board's cflags as well.
for gcc/testsuite/ChangeLog
* gcc.target/arm/multilib.exp: Skip based on board cflags too.
Diff:
---
gcc/testsuite/gcc.target/arm/multilib.exp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/testsuite/gcc.target/arm/multilib.exp
b/gcc/testsuite/gcc.target/arm/multilib.exp
index 4442d5d754bd..12c93bc89d22 100644
--- a/gcc/testsuite/gcc.target/arm/multilib.exp
+++ b/gcc/testsuite/gcc.target/arm/multilib.exp
@@ -18,13 +18,15 @@ load_lib gcc-dg.exp
dg-init
-if { [board_info [target_info name] exists multilib_flags]
- && [regexp {(-marm|-mthumb|-march=.*|-mcpu=.*|-mfpu=.*|-mfloat=abi=.*)\y}
[board_info [target_info name] multilib_flags]] } {
+foreach flagsvar {multilib_flags cflags} {
+ if { [board_info [target_info name] exists $flagsvar]
+ && [regexp {(-marm|-mthumb|-march=.*|-mcpu=.*|-mfpu=.*|-mfloat=abi=.*)\y}
[board_info [target_info name] $flagsvar]] } {
# Multilib flags override anything we can apply to a test, so
# skip if any of the above options are set there.
- verbose "skipping multilib tests due to multilib_flags setting" 1
+ verbose "skipping multilib tests due to $flagsvar setting" 1
return
+ }
}
# We don't want to run this test multiple times in a parallel make check.
