In Rust-GCC/gccrs#4406 commit e429012267c30f23c416bfa2db41d92abe472d18
"gccrs: ast: Fix module path resolution for sibling modules in root", I spotted
'rust/compile/issue_4402_foo.rs' special-casing via 'rust/compile/compile.exp'.
We can instead simply using some standard DejaGnu idiom, like 'dg-skip-if' for
'*-*-*', which turns that one into the expected:

    UNSUPPORTED: rust/compile/issue_4402_foo.rs

        gcc/testsuite/
        * rust/compile/compile.exp: Revert previous change.
        * rust/compile/issue_4402_foo.rs: 'dg-skip-if' for '*-*-*'.
---
 gcc/testsuite/rust/compile/compile.exp       | 17 ++---------------
 gcc/testsuite/rust/compile/issue_4402_foo.rs |  1 +
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/gcc/testsuite/rust/compile/compile.exp 
b/gcc/testsuite/rust/compile/compile.exp
index 41941316d4e0..2c3be80b0146 100644
--- a/gcc/testsuite/rust/compile/compile.exp
+++ b/gcc/testsuite/rust/compile/compile.exp
@@ -28,21 +28,8 @@ dg-init
 set saved-dg-do-what-default ${dg-do-what-default}
 
 set dg-do-what-default "compile"
-
-set tests [lsort [glob -nocomplain $srcdir/$subdir/*.rs]]
-set ignore_list [list "issue_4402_foo.rs"]
-
-set tests_to_run [list]
-foreach t $tests {
-    set filename [file tail $t]
-    if {[lsearch -exact $ignore_list $filename] == -1} {
-        lappend tests_to_run $t
-    }
-}
-
-dg-runtest $tests_to_run "" ""
-
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.rs]] "" ""
 set dg-do-what-default ${saved-dg-do-what-default}
 
 # All done.
-dg-finish
\ No newline at end of file
+dg-finish
diff --git a/gcc/testsuite/rust/compile/issue_4402_foo.rs 
b/gcc/testsuite/rust/compile/issue_4402_foo.rs
index 96266300d112..38f7d54f11d0 100644
--- a/gcc/testsuite/rust/compile/issue_4402_foo.rs
+++ b/gcc/testsuite/rust/compile/issue_4402_foo.rs
@@ -1 +1,2 @@
+// { dg-skip-if "See 'issue-4402.rs'." { *-*-* } }
 pub struct Bar;
\ No newline at end of file
-- 
2.34.1

Reply via email to