From 0ec5fef2187bc6f4f962e3afe1b2d829b7474d80 Mon Sep 17 00:00:00 2001
From: Andreas Tobler <a.tobler@schweiz.ch>
Date: Tue, 18 Nov 2003 08:17:01 +0100
Subject: jar.exp: Cleanup files and reset CLASSPATH.
2003-11-18 Andreas Tobler <a.tobler@schweiz.ch>
* libjava.jar/jar.exp: Cleanup files and reset CLASSPATH.
From-SVN: r73696
---
libjava/testsuite/ChangeLog | 4 ++++
libjava/testsuite/libjava.jar/jar.exp | 12 ++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
(limited to 'libjava')
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index a7fa196..674b0b7 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -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.
diff --git a/libjava/testsuite/libjava.jar/jar.exp b/libjava/testsuite/libjava.jar/jar.exp
index 70a176e..bff1fea 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.1