2 files changed, 31 insertions, 24 deletions
diff --git a/gcc/testsuite/rust/compile/nr2/compile.exp b/gcc/testsuite/rust/compile/nr2/compile.exp
index 35637f1..9e15cdd 100644
--- a/gcc/testsuite/rust/compile/nr2/compile.exp
+++ b/gcc/testsuite/rust/compile/nr2/compile.exp
@@ -19,6 +19,15 @@
 # Load support procs.
 load_lib rust-dg.exp
 
+# These tests don't run runtest_file_p consistently if it
+# doesn't return the same values, so disable parallelization
+# of this *.exp file.  The first parallel runtest to reach
+# this will run all the tests serially.
+if ![gcc_parallel_test_run_p compile] {
+    return
+}
+gcc_parallel_test_enable 0
+
 # Initialize `dg'.
 dg-init
 
@@ -47,18 +56,22 @@ namespace eval rust-nr2-ns {
     set tests_expect_ok ""
     set tests_expect_err ""
 
+    set compile_dir [list {*}[file split $srcdir] {*}[file split $subdir]]
+    set compile_dir [lreplace $compile_dir end end]
+
     foreach test_dir $test_dirs {
-        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]] {
+        foreach test [lsort [glob -nocomplain -tails -directory [file join {*}$compile_dir {*}$test_dir] *.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 [file join {*}$directory $test]
+	        if {[runtest_file_p $runtests [file join {*}$compile_dir {*}$test_dir $test]]} {
+		    lappend tests_expect_ok [list {*}$test_dir $test]
+		}
 	    } else {
-		lappend tests_expect_err [file join {*}$directory $test]
+	        if {[runtest_file_p $runtests [file join {*}$compile_dir {*}$test_dir $test]]} {
+		    lappend tests_expect_err [list {*}$test_dir $test]
+		}
 		set exclude [lreplace $exclude $idx $idx]
 	    }
 	}
@@ -83,10 +96,10 @@ namespace eval rust-nr2-ns {
 		variable record_test_out
 		switch $type {
 		    FAIL {
-			lappend record_test_out "$type: $msg"
+			lappend record_test_out [list $type $msg]
 		    }
 		    XPASS {
-			lappend record_test_out "$type: $msg"
+			lappend record_test_out [list $type $msg]
 		    }
 		}
             }
@@ -109,26 +122,28 @@ namespace eval rust-nr2-ns {
 
     # check for unexpected failures
     foreach test $tests_expect_ok {
-        set fails [try_test $test]
+        set fails [try_test [file join {*}$compile_dir {*}$test]]
 	if {[llength $fails] != 0} {
 	    foreach ent $fails {
-		record_test FAIL "$test: nr2 failure: $ent"
+		record_test [lindex $ent 0] "on nr2: [lindex $ent 1]"
 	    }
 	} else {
-	    record_test PASS "$test: nr2 success"
+	    record_test PASS "[file join {*}$test] on nr2"
 	}
     }
 
     #check for unexpected successes
     foreach test $tests_expect_err {
-        set fails [try_test $test]
+        set fails [try_test [file join {*}$compile_dir {*}$test]]
 	if {[llength $fails] == 0} {
-	    record_test XPASS "$test: nr2 unexpectedly passed"
+	    record_test XPASS "[file join {*}$test] on nr2"
 	} else {
-	    record_test XFAIL "$test: nr2 was rightfully excluded"
+	    record_test XFAIL "[file join {*}$test] on nr2 was rightfully excluded"
 	}
     }
 }
 
 # All done.
 dg-finish
+
+gcc_parallel_test_enable 1
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index 19bf6f8..4772517 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -1,11 +1,8 @@
 canonical_paths1.rs
 cfg1.rs
 generics9.rs
-issue-2043.rs
-issue-2812.rs
 issue-3315-2.rs
 lookup_err1.rs
-macros/mbe/macro6.rs
 multiple_bindings1.rs
 multiple_bindings2.rs
 privacy5.rs
@@ -13,21 +10,16 @@ privacy8.rs
 pub_restricted_1.rs
 pub_restricted_2.rs
 pub_restricted_3.rs
-undeclared_label.rs
 use_1.rs
-while_break_expr.rs
 issue-2905-2.rs
-issue-266.rs
 derive_clone_enum3.rs
 derive-debug1.rs
 derive-default1.rs
-issue-3402-1.rs
-issue-3403.rs
 derive-eq-invalid.rs
 derive-hash1.rs
 torture/alt_patterns1.rs
-torture/loop4.rs
-torture/loop8.rs
 torture/name_resolve1.rs
 issue-3568.rs
+issue-3663.rs
+issue-3671.rs
 # please don't delete the trailing newline