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

jar.exp: Cleanup files and reset CLASSPATH.

Browse Source 
2003-11-18  Andreas Tobler  <a.tobler@schweiz.ch>

	* libjava.jar/jar.exp: Cleanup files and reset CLASSPATH.

From-SVN: r73696
This commit is contained in:
Andreas Tobler 2003-11-18 08:17:01 +01:00 committed by Andreas Tobler
parent 217ec3ae92
commit 0ec5fef218
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libjava/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2003-11-18 Andreas Tobler <a.tobler@schweiz.ch>
* libjava.jar/jar.exp: Cleanup files and reset CLASSPATH.
2003-11-17 Jeff Sturm <jsturm@one-point.com>
* libjava.compile/PR12857.java: New test case.

12
libjava/testsuite/libjava.jar/jar.exp
View File

@ -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