OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

profopt.exp (profopt-cleanup): New argument TESTCASE. 

* lib/profopt.exp (profopt-cleanup): New argument TESTCASE.
	Remove only files with the same base name as the test case.
	(profopt-perf-value): Pass TESTCASE to profopt-cleanup.
	(profopt-execute): Likewise.  Also, remove old profiling
	and performance data files before running the tests.

	* gcc.misc-tests/bprob.exp: Remove profopt-cleanup calls.
	* g++.dg/bprob/bprob.exp: Likewise.
	* g77.dg/bprob/bprob.exp: Likewise.  Also, relax regexp
	to allow more general test case names.

	* g++.dg/bprob/bprob-1.C: Rename to ...
	* g++.dg/bprob/g++-bprob-1.C: ... this.

	* g77.dg/bprob/bprob-1.f: Rename to ...
	* g77.dg/bprob/g77-bprob-1.f: ... this.

From-SVN: r58380
This commit is contained in:
Ulrich Weigand 2002-10-21 20:21:00 +00:00 committed by Ulrich Weigand
parent 5d4d885ca6
commit aaee784acf
7 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,22 @@
2002-10-21 Ulrich Weigand <uweigand@de.ibm.com>
* lib/profopt.exp (profopt-cleanup): New argument TESTCASE.
Remove only files with the same base name as the test case.
(profopt-perf-value): Pass TESTCASE to profopt-cleanup.
(profopt-execute): Likewise. Also, remove old profiling
and performance data files before running the tests.
* gcc.misc-tests/bprob.exp: Remove profopt-cleanup calls.
* g++.dg/bprob/bprob.exp: Likewise.
* g77.dg/bprob/bprob.exp: Likewise. Also, relax regexp
to allow more general test case names.
* g++.dg/bprob/bprob-1.C: Rename to ...
* g++.dg/bprob/g++-bprob-1.C: ... this.
* g77.dg/bprob/bprob-1.f: Rename to ...
* g77.dg/bprob/g77-bprob-1.f: ... this.
2002-10-21 Zack Weinberg <zack@codesourcery.com>
* gcc.dg/noncompile/920923-1.c: Prevent spurious regressions with

3
gcc/testsuite/g++.dg/bprob/bprob.exp
View File

@ -51,9 +51,6 @@ if $tracelevel then {
# Load support procs.
load_lib profopt.exp
# Clean up existing .da files.
profopt-cleanup da
# Main loop.
foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.C]] {
# If we're only testing specific files and this isn't one of them, skip it.

0
gcc/testsuite/g++.dg/bprob/bprob-1.C → gcc/testsuite/g++.dg/bprob/g++-bprob-1.C
View File

6
gcc/testsuite/g77.dg/bprob/bprob.exp
View File

@ -48,11 +48,7 @@ if $tracelevel then {
# Load support procs.
load_lib profopt.exp
# Clean up existing .da and .tim files.
profopt-cleanup da
profopt-cleanup tim
foreach src [lsort [glob -nocomplain $srcdir/$subdir/bprob-*.f]] {
foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.f]] {
# If we're only testing specific files and this isn't one of them, skip it.
if ![runtest_file_p $runtests $src] then {
continue

0
gcc/testsuite/g77.dg/bprob/bprob-1.f → gcc/testsuite/g77.dg/bprob/g77-bprob-1.f
View File

4
gcc/testsuite/gcc.misc-tests/bprob.exp
View File

@ -48,10 +48,6 @@ if $tracelevel then {
# Load support procs.
load_lib profopt.exp
# Clean up existing .da and .tim files.
profopt-cleanup da
profopt-cleanup tim
foreach src [lsort [glob -nocomplain $srcdir/$subdir/bprob-*.c]] {
# If we're only testing specific files and this isn't one of them, skip it.
if ![runtest_file_p $runtests $src] then {

19
gcc/testsuite/lib/profopt.exp
View File

@ -71,10 +71,13 @@ set option_list $PROFOPT_OPTIONS
#
# profopt-cleanup -- remove profiling or performance results files.
#
# EXT is the extension of files to remove
# TESTCASE is the name of the test
# EXT is the extension of file to remove
#
proc profopt-cleanup { ext } {
set files [glob -nocomplain *.$ext]
proc profopt-cleanup { testcase ext } {
set basename [file tail $testcase]
set base [file rootname $basename]
set files [glob -nocomplain $base.$ext]
if { $files != "" } {
eval "remote_file build delete $files"
}
@ -112,7 +115,7 @@ proc profopt-perf-value { testcase perf_ext optstr } {
fail "$testcase perf check: file $base.$perf_ext has wrong format, $optstr"
}
close $fd
profopt-cleanup $perf_ext
profopt-cleanup $testcase $perf_ext
return $val
}
@ -150,6 +153,12 @@ proc profopt-execute { src } {
remote_file build delete $execname3
verbose "Testing $testcase, $option" 1
# Remove old profiling and performance data files.
profopt-cleanup $testcase $prof_ext
if [info exists perf_ext] {
profopt-cleanup $testcase $perf_ext
}
# Compile for profiling.
set options ""
@ -210,7 +219,7 @@ proc profopt-execute { src } {
}
# Remove the profiling data files.
profopt-cleanup $prof_ext
profopt-cleanup $testcase $prof_ext
# If the test is not expected to produce performance data then
# we're done now.