From 1402665c8f4327b303b8d152c698fe821874f3eb Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 20 Jan 2021 22:02:33 +0100 Subject: [PATCH] [gdb/testsuite] Skip gdb.rust/*.exp for target board unix/-m32 When running gdb.rust/*.exp with target board unix/-m32, we see: ... Running src/gdb/testsuite/gdb.rust/union.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/modules.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/unsized.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/simple.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/watch.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/traits.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/expr.exp ... Running src/gdb/testsuite/gdb.rust/rust-style.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/methods.exp ... gdb compile failed, error: Unrecognized option: 'm' Running src/gdb/testsuite/gdb.rust/generics.exp ... gdb compile failed, error: Unrecognized option: 'm' === gdb Summary === nr of expected passes 95 nr of untested testcases 9 ... Fix this by testing for -m32 in the target board multilib_flags in skip_rust_tests. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2021-01-20 Tom de Vries * lib/gdb.exp (skip_rust_tests): Skip if multilib_flags contains -m32. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/lib/gdb.exp | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a0211565d2e..b197b0b4e5a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2021-01-20 Tom de Vries + + * lib/gdb.exp (skip_rust_tests): Skip if multilib_flags contains -m32. + 2021-01-20 Sergio Durigan Junior * gdb.arch/amd64-stap-expressions.S: New file. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index ae24fe2f49c..23792e04c70 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2185,7 +2185,22 @@ proc skip_d_tests {} { # Return 1 to skip Rust tests, 0 to try them. proc skip_rust_tests {} { - return [expr {![isnative]}] + if { ![isnative] } { + return 1 + } + + # The rust compiler does not support "-m32", skip. + global board board_info + set board [target_info name] + if {[board_info $board exists multilib_flags]} { + foreach flag [board_info $board multilib_flags] { + if { $flag == "-m32" } { + return 1 + } + } + } + + return 0 } # Return a 1 for configurations that do not support Python scripting. -- 2.30.2