https://gcc.gnu.org/g:da37d3556c6b2e537e944d273f6a38da6bd4773c
commit r15-8502-gda37d3556c6b2e537e944d273f6a38da6bd4773c
Author: Owen Avery <powerboat9.ga...@gmail.com>
Date: Wed Oct 16 20:18:48 2024 -0400
gccrs: Improve path handling while testing name resolution 2.0
gcc/testsuite/ChangeLog:
* rust/compile/nr2/compile.exp: Handle paths using "file join"
and "file split".
* rust/compile/nr2/exclude: Remove debug-diagnostics-on.rs.
Signed-off-by: Owen Avery <powerboat9.ga...@gmail.com>
Diff:
---
gcc/testsuite/rust/compile/nr2/compile.exp | 18 +++++++++---------
gcc/testsuite/rust/compile/nr2/exclude | 5 -----
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/gcc/testsuite/rust/compile/nr2/compile.exp
b/gcc/testsuite/rust/compile/nr2/compile.exp
index 0afe36c3c403..f2724f6c4544 100644
--- a/gcc/testsuite/rust/compile/nr2/compile.exp
+++ b/gcc/testsuite/rust/compile/nr2/compile.exp
@@ -44,23 +44,23 @@ namespace eval rust-nr2-ns {
# Run tests in directories
# Manually specifying these, in case some other test file
# does something weird
- set test_dirs {. compile macros/builtin macros/mbe macros/proc}
+ set test_dirs {{} {macros builtin} {macros mbe} {macros proc}}
set tests_expect_ok ""
set tests_expect_err ""
foreach test_dir $test_dirs {
- foreach test [lsort [glob -nocomplain -tails -directory
$srcdir/$subdir/../$test_dir *.rs]] {
- if {$test_dir == "."} {
- set test_lbl $test
- } else {
- set test_lbl "$test_dir/$test"
- }
+ set directory [list {*}[file split $srcdir] {*}[file split $subdir]]
+ set directory [lreplace $directory end end]
+ set directory [list {*}$directory {*}$test_dir]
+ foreach test [lsort [glob -nocomplain -tails -directory [file join
{*}$directory] *.rs]] {
+ # use '/' as the path seperator for entries in the exclude file
+ set test_lbl [join [list {*}$test_dir $test] "/"]
set idx [lsearch -exact -sorted $exclude $test_lbl]
if {$idx == -1} {
- lappend tests_expect_ok $srcdir/$subdir/../$test_dir/$test
+ lappend tests_expect_ok [file join {*}$directory $test]
} else {
- lappend tests_expect_err $srcdir/$subdir/../$test_dir/$test
+ lappend tests_expect_err [file join {*}$directory $test]
set exclude [lreplace $exclude $idx $idx]
}
}
diff --git a/gcc/testsuite/rust/compile/nr2/exclude
b/gcc/testsuite/rust/compile/nr2/exclude
index 57bcca0a60e5..450fc254452d 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -1,8 +1,3 @@
-# relies on exact source file path match
-# TODO: patch this file or nr2/compile.exp to handle this
-debug-diagnostics-on.rs
-
-# main list
attr-mismatch-crate-name.rs
attr_deprecated.rs
attr_deprecated_2.rs
