Refactor DejaGNU testsuite

Use more standard layout for DejaGNU testsuite.

3 subdirectories are used for tests:
- compile/*: tests are build using default torture options.
- xfail_compile/*: tests are expected to fail early in the frontend and are only
build once.
- execute/*: tests are executed and exit status is checked.

The previous .exp files were copied from D tests and were expected to be used in
a different way not really applicable for the current Rust tests.

Fixes Rust-GCC#281

Author: dkm

gcc/testsuite/lib/rust-dg.exp

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2019 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,30 +19,7 @@ load_lib gcc-dg.exp
 # Define rust callbacks for dg.exp.
 
 proc rust-dg-test { prog do_what extra_tool_flags } {
-    upvar dg-do-what dg-do-what
-
-    # Demote link and run tests to compile-only if D runtime is missing.
-    if ![check_effective_target_d_runtime] {
-	switch $do_what {
-	    link -
-	    run {
-		set do_what compile
-		set dg-do-what compile
-	    }
-	}
-    }
-
-    # Strip rust.test prefix off test names to avoid pathname failures in
-    # some tests.
-    set prog [dg-trim-dirname rust.test $prog]
-
-    set result \
-	[gcc-dg-test-1 rust_target_compile $prog $do_what $extra_tool_flags]
-
-    set comp_output [lindex $result 0]
-    set output_file [lindex $result 1]
-
-    return [list $comp_output $output_file]
+    return [gcc-dg-test-1 rust_target_compile $prog $do_what $extra_tool_flags]
 }
 
 proc rust-dg-prune { system text } {
@@ -51,39 +28,6 @@ proc rust-dg-prune { system text } {
 
 # Utility routines.
 
-#
-# Modified dg-runtest that can cycle through a list of optimization options
-# as c-torture does.
-#
-
-proc rust-dg-runtest { testcases flags default-extra-flags } {
-    global runtests
-
-    foreach test $testcases {
-	# If we're only testing specific files and this isn't one of
-	# them, skip it.
-	
-	if ![runtest_file_p $runtests $test] {
-	    continue
-	}
-
-	# Use TORTURE_OPTIONS to cycle through an option list.
-	if [torture-options-exist] then {
-	    global torture_with_loops
-	    set option_list $torture_with_loops
-	} else {
-	    set option_list { "" }
-	}
-
-	set nshort [file tail [file dirname $test]]/[file tail $test]
-
-	foreach flags_t $option_list {
-	    verbose "Testing $nshort, $flags $flags_t" 1
-	    dg-test $test "$flags $flags_t" ${default-extra-flags}
-	}
-    }
-}
-
 #
 # rust_load -- wrapper around default rust_load to handle tests that
 # require program arguments passed to them.
@@ -98,7 +42,6 @@ if { [info procs rust_load] != [list] \
 	if [info exists RUST_EXECUTE_ARGS] then {
 	    set args [concat "{$RUST_EXECUTE_ARGS}"]
 	}
-	#print "Running: $program [lindex $args 0]"
 	set result [eval [list prev_rust_load $program] $args ]
 	return $result
     }

gcc/testsuite/lib/rust.exp

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020 Free Software Foundation, Inc.
+# Copyright (C) 2012-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,39 +30,6 @@ load_lib target-libpath.exp
 set rust_compile_options ""
 
 
-#
-# rust_version -- extract and print the version number of the compiler
-#
-
-proc rust_version { } {
-    global RUST_UNDER_TEST
-
-    rust_init
-
-    # ignore any arguments after the command
-    set compiler [lindex $RUST_UNDER_TEST 0]
-
-    # verify that the compiler exists
-    if { [is_remote host] || [which $compiler] != 0 } then {
-	set tmp [remote_exec host "$compiler -v"]
-	set status [lindex $tmp 0]
-	set output [lindex $tmp 1]
-	regexp " version \[^\n\r\]*" $output version
-	if { $status == 0 && [info exists version] } then {
-	    if [is_remote host] {
-		clone_output "$compiler $version\n"
-	    } else {
-		clone_output "[which $compiler] $version\n"
-	    }
-	} else {
-	    clone_output "Couldn't determine version of $output [which $compiler]\n"
-	}
-    } else {
-	# compiler does not exist (this should have already been detected)
-	warning "$compiler does not exist"
-    }
-}
-
 #
 # rust_include_flags -- include flags for the gcc tree structure
 #
@@ -118,7 +85,7 @@ proc rust_init { args } {
     global libdir
     global gluefile wrap_flags
     global objdir srcdir
-    global ALWAYS_DFLAGS
+    global ALWAYS_RUSTFLAGS
     global TOOL_EXECUTABLE TOOL_OPTIONS
     global RUST_UNDER_TEST
     global TESTING_IN_BUILD_TREE
@@ -148,6 +115,7 @@ proc rust_init { args } {
 	    exit 1
 	}
     }
+
     if ![info exists tmpdir] {
 	set tmpdir "/tmp"
     }
@@ -164,24 +132,24 @@ proc rust_init { args } {
     # compilation.  They are passed first to allow individual
     # tests to override them.
     if [info exists TEST_ALWAYS_FLAGS] {
-	lappend ALWAYS_DFLAGS "additional_flags=$TEST_ALWAYS_FLAGS"
+	lappend ALWAYS_RUSTFLAGS "additional_flags=$TEST_ALWAYS_FLAGS"
     }
 
     if ![is_remote host] {
 	if [info exists TOOL_OPTIONS] {
-	    lappend ALWAYS_DFLAGS "additional_flags=[rust_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"
-	    lappend ALWAYS_DFLAGS "ldflags=[rust_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"
+	    lappend ALWAYS_RUSTFLAGS "additional_flags=[rust_include_flags [get_multilibs ${TOOL_OPTIONS}] ]"
+	    lappend ALWAYS_RUSTFLAGS "ldflags=[rust_link_flags [get_multilibs ${TOOL_OPTIONS}] ]"
 	} else {
-	    lappend ALWAYS_DFLAGS "additional_flags=[rust_include_flags [get_multilibs] ]"
-	    lappend ALWAYS_DFLAGS "ldflags=[rust_link_flags [get_multilibs] ]"
+	    lappend ALWAYS_RUSTFLAGS "additional_flags=[rust_include_flags [get_multilibs] ]"
+	    lappend ALWAYS_RUSTFLAGS "ldflags=[rust_link_flags [get_multilibs] ]"
 	}
     }
 
     if [info exists TOOL_OPTIONS] {
-	lappend ALWAYS_DFLAGS "additional_flags=$TOOL_OPTIONS"
+	lappend ALWAYS_RUSTFLAGS "additional_flags=$TOOL_OPTIONS"
     }
 
-    verbose -log "ALWAYS_DFLAGS set to $ALWAYS_DFLAGS"
+    verbose -log "ALWAYS_RUSTFLAGS set to $ALWAYS_RUSTFLAGS"
 
     set gcc_warning_prefix "warning:"
     set gcc_error_prefix "(fatal )?error:"
@@ -196,7 +164,7 @@ proc rust_init { args } {
 proc rust_target_compile { source dest type options } {
     global tmpdir
     global gluefile wrap_flags
-    global ALWAYS_DFLAGS
+    global ALWAYS_RUSTFLAGS
     global RUST_UNDER_TEST
 
     if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
@@ -207,7 +175,14 @@ proc rust_target_compile { source dest type options } {
     lappend options "timeout=[timeout_value]"
     lappend options "compiler=$RUST_UNDER_TEST"
 
-    set options [concat "$ALWAYS_DFLAGS" $options]
+    set options [concat "$ALWAYS_RUSTFLAGS" $options]
     set options [dg-additional-files-options $options $source]
+
+    ## FIXME: until the compiler is made less verbose, we need to prune its output completely.
+    # Only keep line containing error so that the test will correctly report the error and the test
+    # can FAIL or XFAIL
+    global additional_prunes
+    set additional_prunes "^((?!error).)*$"
+
     return [target_compile $source $dest $type $options]
 }

gcc/testsuite/rust.test/compilable/arithmetic_expressions1.rs renamed to gcc/testsuite/rust.test/compile/arithmetic_expressions1.rs

@@ -0,0 +1,35 @@
+# Copyright (C) 2021 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+#
+# Rust torture test suite.
+#
+
+# Load support procs.
+load_lib rust-dg.exp
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+set saved-dg-do-what-default ${dg-do-what-default}
+
+set dg-do-what-default "compile"
+gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.rs]] "" "-w"
+set dg-do-what-default ${saved-dg-do-what-default}
+
+# All done.
+dg-finish

gcc/testsuite/rust.test/compilable/arrays1.rs renamed to gcc/testsuite/rust.test/compile/arrays1.rs

@@ -0,0 +1,3 @@
+fn main() -> i32 {
+    0
+}

gcc/testsuite/rust.test/compilable/arrays2.rs renamed to gcc/testsuite/rust.test/compile/arrays2.rs

@@ -0,0 +1,35 @@
+# Copyright (C) 2021 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+#
+# Rust torture test suite.
+#
+
+# Load support procs.
+load_lib rust-dg.exp
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+set saved-dg-do-what-default ${dg-do-what-default}
+
+set dg-do-what-default "run"
+gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.rs]] "" "-w"
+set dg-do-what-default ${saved-dg-do-what-default}
+
+# All done.
+dg-finish

gcc/testsuite/rust.test/compilable/arrays_index1.rs renamed to gcc/testsuite/rust.test/compile/arrays_index1.rs

@@ -0,0 +1,5 @@
+// { dg-xfail-run-if "" { *-*-* } }
+// { dg-excess-errors "Noisy debug print" }
+fn main() -> i32 {
+    1
+}