From ace90aef2f1ae32d158f6b60690e3aaf47e95eca Mon Sep 17 00:00:00 2001 From: andreast Date: Tue, 18 Nov 2003 07:17:01 +0000 Subject: 2003-11-18 Andreas Tobler * libjava.jar/jar.exp: Cleanup files and reset CLASSPATH. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73696 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/testsuite/libjava.jar/jar.exp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'libjava/testsuite/libjava.jar/jar.exp') diff --git a/libjava/testsuite/libjava.jar/jar.exp b/libjava/testsuite/libjava.jar/jar.exp index 70a176ee43c..bff1fea2c8c 100644 --- a/libjava/testsuite/libjava.jar/jar.exp +++ b/libjava/testsuite/libjava.jar/jar.exp @@ -19,7 +19,7 @@ proc gcj_jar_compile_one {jarfile mainclass} { proc gcj_jar_interpret {jarfile} { global INTERPRETER srcdir - set gij [libjava_find_gij] + set gij [libjava_find_gij] # libjava_find_gij will return `gij' if it couldn't find the # program; in this case we want to skip the test. if {$INTERPRETER != "yes" || $gij == "gij"} { @@ -35,7 +35,7 @@ proc gcj_jar_interpret {jarfile} { } proc gcj_jar_run {} { - global srcdir subdir + global srcdir subdir env foreach jar [lsort [glob -nocomplain ${srcdir}/${subdir}/*.jar]] { set xff [file rootname $jar].xfail set main {} @@ -54,6 +54,14 @@ proc gcj_jar_run {} { gcj_jar_interpret $jar } } + # When we succeed we remove all our clutter. + eval gcj_cleanup [glob -nocomplain -- ${main}.*] [list $main ] + + # Reset CLASSPATH that we do not look into testsuite/libjava.jar for *.jar + # files which do not belong to the libgcj itself. + set env(CLASSPATH) "" + + return 1 } gcj_jar_run -- cgit v1.2.3