1 files changed, 12 insertions, 25 deletions

diff --git a/gcc/testsuite/rust.test/rust-test.exp b/gcc/testsuite/rust.test/rust-test.exp
index fca3f16..cc32454 100644
--- a/gcc/testsuite/rust.test/rust-test.exp
+++ b/gcc/testsuite/rust.test/rust-test.exp
@@ -310,23 +310,11 @@ proc dmd2dg { base test } {
 	}
 
 	compilable {
-	    set out_line "// { dg-final { output-exists } }"
-	    puts $fdout $out_line
-
-	    # Check that Ddoc tests also generate a html file.
-	    if [regexp -- "ddoc.*" $name] {
-		set ddocfile "[file rootname $name].html"
-		set out_line "// { dg-final { scan-file $ddocfile \"Generated by Ddoc from $test\" } }"
-		puts $fdout $out_line
-		# Cleanup extra generated files.
-		set out_line "// { dg-final { file delete $ddocfile } }"
-		puts $fdout $out_line
-	    }
+	    puts $fdout "// { dg-final { output-exists } }"
 	}
 
 	fail_compilation {
-	    set out_line "// { dg-final { output-exists-not } }"
-	    puts $fdout $out_line
+	    puts $fdout "// { dg-do run { xfail *-*-* } }"
 	}
     }
 
@@ -336,6 +324,7 @@ proc dmd2dg { base test } {
     return $test
 }
 
+
 proc rust-permute-options { options } {
     set result { }
     set n [expr 1<<[llength $options]]
@@ -395,11 +384,6 @@ proc rust-do-test { } {
     foreach test [lsort [find $srcdir/$subdir *]] {
 	regexp -- "(.*)/(.+)/(.+)\.rs$" $test match base dir name ext
 	set ext "rs"
-	
-	# Skip invalid test directory
-	if { [lsearch "compilable" $dir] == -1 } {
-	    continue
-	}
 
 	# Skip invalid test extensions
 	if { [lsearch "rs" $ext] == -1 } {
@@ -421,12 +405,15 @@ proc rust-do-test { } {
 	    compilable {
 		for { set i 0 } { $i<[llength $options] } { incr i } {
 		    set flags [lindex $options $i]
-		    # Compilable test may require checking another kind of output file.
-		    if [regexp -- "ddoc.*" $name] {
-			set dg-do-what-default "compile"
-		    } else {
-			set dg-do-what-default "assemble"
-		    }
+		    set dg-do-what-default "compile"
+		    rust-dg-runtest $filename $flags $imports
+		}
+	    }
+
+	    fail_compilation {
+		for { set i 0 } { $i<[llength $options] } { incr i } {
+		    set flags [lindex $options $i]
+		    set dg-do-what-default "compile"
 		    rust-dg-runtest $filename $flags $imports
 		}
 	    }