[ada, testsuite] gnat.dg cleanup
Rainer Orth
ro@CeBiTec.Uni-Bielefeld.DE
Mon Jan 17 13:32:00 GMT 2011
Arnaud Charlet <charlet@adacore.com> writes:
>> It's not: separate dirs are only used when when running the same tool
>> (gnat in this case) in parallel on separate distinct parts of the
>> testsuite. I don't yet know how hard it would be to coerce DejaGnu to
>> do this. As an alternative, is it possible to detect the list of
>> additional packages used by the package under test? If so, this
>> information could easily be used for automatic cleanup.
>
> You could probably use 'gnatclean -q <mainfile>' which would basically know
> what files to clean up (at least for .o and .ali files), except that
> fundamentally, if you're running all the tests under the same directory, you
> may end up with race conditions if e.g. two tests use the same 'support'
> package/file, and gnatclean is deleting the compilation artefacts of this
> support package, while another gnatmake/test tries to use/reuse it.
The following revised patch follows this suggestion and can do away with
the cleanup-packages annotations.
It also removes the gnat-dg-runtest proc, which is unused, and
runtest_file_p, which is both in DejaGnu 1.4.4, which is required to run
the testsuite, and in gcc-defs.exp, which is loaded.
I've also determined why the gnatmake version output didn't show up in
mail-report log: contrib/test_summary expects that the second field in
the version line be "version", which doesn't match what gnatmake
--version emits, so I'm printing "version" in default_gnat_version.
The diff below was created with diff -b so the whitespace diffs from the
reindentaions don't show, but this slightly confuses the find_gnatclean
definition.
Tested on i386-pc-solaris2.11.
Ok for mainline?
Rainer
2011-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* lib/gnat.exp: Fix comments.
Don't load libgloss.exp.
(default_gnat_version): Call $compiler with --version.
Adapt regexp for gnatmake output, insert version.
(gnat_version): New proc.
(gnat_init): Remove gnat_libgcc_s_path.
(gnat_target_compile): Likewise.
Remove ld_library_path.
Log ADA_INCLUDE_PATH, ADA_OBJECTS_PATH.
(gnat_pass): Remove.
(gnat_pass): Remove.
(gnat_finish): Remove.
(gnat_exit): Remove.
(local_find_gnatmake): Reindent.
(runtest_file_p): Remove.
(prune_warnings): Remove.
(find_gnatclean): New proc.
* lib/gnat-dg.exp (lremove): New proc.
(gnat-dg-test): Reindent.
Remove additional output files.
(gnat-dg-runtest): Remove.
* gnat.dg/array7.adb: Use cleanup-tree-dump "optimized".
* gnat.dg/loop_optimization6.adb: Likewise.
* gnat.dg/atomic1.adb: Use cleanup-tree-dump "gimple".
diff -r 345f5a651fa0 gcc/testsuite/gnat.dg/array7.adb
--- a/gcc/testsuite/gnat.dg/array7.adb Fri Jan 14 21:53:16 2011 +0100
+++ b/gcc/testsuite/gnat.dg/array7.adb Sat Jan 15 21:21:33 2011 +0100
@@ -20,3 +20,4 @@
end Array7;
-- { dg-final { scan-tree-dump-not "MAX_EXPR" "optimized" } }
+-- { dg-final { cleanup-tree-dump "optimized" } }
diff -r 345f5a651fa0 gcc/testsuite/gnat.dg/atomic1.adb
--- a/gcc/testsuite/gnat.dg/atomic1.adb Fri Jan 14 21:53:16 2011 +0100
+++ b/gcc/testsuite/gnat.dg/atomic1.adb Sat Jan 15 21:21:33 2011 +0100
@@ -15,3 +15,4 @@
-- { dg-final { scan-tree-dump-times "v_16" 1 "gimple"} }
-- { dg-final { scan-tree-dump-times "v_32" 1 "gimple"} }
+-- { dg-final { cleanup-tree-dump "gimple" } }
diff -r 345f5a651fa0 gcc/testsuite/gnat.dg/loop_optimization6.adb
--- a/gcc/testsuite/gnat.dg/loop_optimization6.adb Fri Jan 14 21:53:16 2011 +0100
+++ b/gcc/testsuite/gnat.dg/loop_optimization6.adb Sat Jan 15 21:21:33 2011 +0100
@@ -23,3 +23,4 @@
end Loop_Optimization6;
-- { dg-final { scan-tree-dump-not "goto" "optimized"} }
+-- { dg-final { cleanup-tree-dump "optimized" } }
--- solaris.345f5a651fa0/gcc/testsuite/lib/gnat.exp 2011-01-17 13:23:24.571315209 +0100
+++ solaris.0f061b0dad3e/gcc/testsuite/lib/gnat.exp 2011-01-17 13:23:24.698817302 +0100
@@ -1,4 +1,5 @@
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
+# 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
@@ -20,11 +21,6 @@
# This file is loaded by the tool init file (eg: unix.exp). It provides
# default definitions for gnat_start, etc. and other supporting cast members.
-# These globals are used if no compiler arguments are provided.
-# They are also used by the various testsuites to define the environment:
-# where to find stdio.h, libc.a, etc.
-
-load_lib libgloss.exp
load_lib prune.exp
load_lib gcc-defs.exp
load_lib gcc.exp
@@ -54,12 +50,13 @@ proc default_gnat_version { } {
# verify that the compiler exists
if { $compiler_name != 0 } then {
- set tmp [remote_exec host "$compiler -v"]
+ set tmp [remote_exec host "$compiler --version"]
set status [lindex $tmp 0]
set output [lindex $tmp 1]
- regexp " version \[^\n\r\]*" $output version
+ regexp "^GNATMAKE (\[^\n\r\]*)" $output verline version
if { $status == 0 && [info exists version] } then {
- clone_output "$compiler_name $version\n"
+ # test_summary expects "version" as second field.
+ clone_output "$compiler_name version $version\n"
} else {
clone_output "Couldn't determine version of $compiler_name: $output\n"
}
@@ -69,10 +66,16 @@ proc default_gnat_version { } {
}
}
-# gnat_init -- called at the start of each .exp script.
#
-# There currently isn't much to do, but always using it allows us to
-# make some enhancements without having to go back and rewrite the scripts.
+# gnat_version -- Call default_gnat_version, so we can override it if needed.
+#
+
+proc gnat_version { } {
+ default_gnat_version
+}
+
+#
+# gnat_init -- called at the start of each .exp script.
#
set gnat_initialized 0
@@ -85,7 +88,6 @@ proc gnat_init { args } {
global gnat_initialized
global GNAT_UNDER_TEST
global TOOL_EXECUTABLE
- global gnat_libgcc_s_path
global gnat_target_current
set gnat_target_current ""
@@ -103,23 +105,6 @@ proc gnat_init { args } {
if ![info exists tmpdir] then {
set tmpdir /tmp
}
-
- set gnat_libgcc_s_path "${rootme}"
- # Leave this here since Ada should support multilibs at some point.
- set compiler [lindex $GNAT_UNDER_TEST 0]
-# if { [is_remote host] == 0 && [which $compiler] != 0 } {
-# foreach i "[exec $compiler --print-multi-lib]" {
-# set mldir ""
-# regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
-# set mldir [string trimright $mldir "\;@"]
-# if { "$mldir" == "." } {
-# continue
-# }
-# if { [llength [glob -nocomplain ${rootme}/${mldir}/libgcc_s*.so.*]] >= 1 } {
-# append gnat_libgcc_s_path ":${rootme}/${mldir}"
-# }
-# }
-# }
}
proc gnat_target_compile { source dest type options } {
@@ -129,8 +114,6 @@ proc gnat_target_compile { source dest t
global srcdir
global GNAT_UNDER_TEST
global TOOL_OPTIONS
- global ld_library_path
- global gnat_libgcc_s_path
global gnat_target_current
# dg-require-effective-target tests must be compiled as C.
@@ -158,9 +141,11 @@ proc gnat_target_compile { source dest t
# specify via environment
setenv ADA_INCLUDE_PATH "$rtsdir/adainclude"
setenv ADA_OBJECTS_PATH "$rtsdir/adainclude"
+ # Always log so compilations can be repeated manually.
+ verbose -log "ADA_INCLUDE_PATH=$rtsdir/adainclude"
+ verbose -log "ADA_OBJECTS_PATH=$rtsdir/adainclude"
}
- set ld_library_path ".:${gnat_libgcc_s_path}"
lappend options "compiler=$GNAT_UNDER_TEST -q -f"
lappend options "timeout=[timeout_value]"
@@ -175,71 +160,9 @@ proc gnat_target_compile { source dest t
set options [concat "additional_flags=$TOOL_OPTIONS" $options]
}
- # If we have built libada along with the compiler, point the test harness
- # at it (and associated headers).
-
-# set sourcename [string range $source 0 [expr [string length $source] - 5]]
-# set dest ""
-
return [target_compile $source $dest $type $options]
}
-#
-# gnat_pass -- utility to record a testcase passed
-#
-
-proc gnat_pass { testcase cflags } {
- if { "$cflags" == "" } {
- pass "$testcase"
- } else {
- pass "$testcase, $cflags"
- }
-}
-
-#
-# gnat_fail -- utility to record a testcase failed
-#
-
-proc gnat_fail { testcase cflags } {
- if { "$cflags" == "" } {
- fail "$testcase"
- } else {
- fail "$testcase, $cflags"
- }
-}
-
-#
-# gnat_finish -- called at the end of every .exp script that calls gnat_init
-#
-# The purpose of this proc is to hide all quirks of the testing environment
-# from the testsuites. It also exists to undo anything that gnat_init did
-# (that needs undoing).
-#
-
-proc gnat_finish { } {
- # The testing harness apparently requires this.
- global errorInfo
-
- if [info exists errorInfo] then {
- unset errorInfo
- }
-
- # Might as well reset these (keeps our caller from wondering whether
- # s/he has to or not).
- global prms_id bug_id
- set prms_id 0
- set bug_id 0
-}
-
-proc gnat_exit { } {
- global gluefile
-
- if [info exists gluefile] {
- file_on_build delete $gluefile
- unset gluefile
- }
-}
-
# Prune messages from GNAT that aren't useful.
proc prune_gnat_output { text } {
@@ -292,27 +215,25 @@ proc local_find_gnatmake {} {
return $CC
}
-# If this is an older version of DejaGnu (without runtest_file_p),
-# provide one and assume the old syntax: foo1.exp bar1.c foo2.exp bar2.c.
-# This can be deleted after next DejaGnu release.
-
-if { [info procs runtest_file_p] == "" } then {
- proc runtest_file_p { runtests testcase } {
- if { $runtests != "" && [regexp "\[.\]\[cC\]" $runtests] } then {
- if { [lsearch $runtests [file tail $testcase]] >= 0 } then {
- return 1
- } else {
- return 0
+proc find_gnatclean {} {
+ global tool_root_dir
+
+ if ![is_remote host] {
+ set file [lookfor_file $tool_root_dir gnatclean]
+ if { $file == "" } {
+ set file [lookfor_file $tool_root_dir gcc/gnatclean]
}
+ if { $file != "" } {
+ set gnatclean $file;
+ } else {
+ set gnatclean [transform gnatclean]
}
- return 1
+ } else {
+ set gnatclean [transform gnatclean]
}
+ return $gnatclean
}
-# Provide a definition of this if missing (delete after next DejaGnu release).
-
-if { [info procs prune_warnings] == "" } then {
- proc prune_warnings { text } {
- return $text
- }
-}
+# Local Variables:
+# tcl-indent-level:4
+# End:
--- solaris.345f5a651fa0/gcc/testsuite/lib/gnat-dg.exp 2011-01-17 13:23:31.737756054 +0100
+++ solaris.0f061b0dad3e/gcc/testsuite/lib/gnat-dg.exp 2011-01-17 13:23:31.910257432 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2010, 2011 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
@@ -16,13 +16,37 @@
load_lib gcc-dg.exp
+# Remove VALUE from LIST_VARIABLE.
+proc lremove {list_variable value} {
+ upvar 1 $list_variable var
+ set idx [lsearch -exact $var $value]
+ set var [lreplace $var $idx $idx]
+}
+
# Define gcc callbacks for dg.exp.
proc gnat-dg-test { prog do_what extra_tool_flags } {
if { $do_what == "compile" } {
lappend extra_tool_flags "-c"
}
- return [gcc-dg-test-1 gnat_target_compile $prog $do_what $extra_tool_flags]
+ set result [gcc-dg-test-1 gnat_target_compile $prog $do_what $extra_tool_flags]
+
+ # Remove additional output files apart from $output_file, which may be
+ # needed by dg-final.
+ set output_file [lindex $result 1]
+ set basename [file rootname $output_file]
+ set clean_result [remote_exec host [find_gnatclean] "-c -q -n $basename"]
+ if { [lindex $clean_result 0] != -1 } {
+ set clean_files [lindex $clean_result 1]
+ # Purge NL from clean_files.
+ regsub -all "\[\r\n\]+" $clean_files " " clean_files
+ # Remove ./ so lremove works.
+ regsub -all "\./" $clean_files "" clean_files
+ lremove clean_files $output_file
+ eval remote_file host delete $clean_files
+ }
+
+ return $result
}
proc gnat-dg-prune { system text } {
@@ -38,12 +62,6 @@ proc gnat-dg-prune { system text } {
# Utility routines.
-# Modified dg-runtest that can cycle through a list of optimization options
-# as c-torture does.
-proc gnat-dg-runtest { testcases default-extra-flags } {
- return [gcc-dg-runtest $testcases ${default-extra-flags}]
-}
-
#
# gnat_load -- wrapper around default gnat_load to declare tasking tests
# unsupported on platforms that lack such support
@@ -64,3 +82,7 @@ if { [info procs gnat_load] != [list] \
return $result
}
}
+
+# Local Variables:
+# tcl-indent-level:4
+# End:
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University
More information about the Gcc-patches
mailing list