/hg/icedtea6: Make sure that the regression test

[ptisnovs at icedtea.classpath.org]

changeset cfb9d61da90f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cfb9d61da90f
author: ptisnovs
date: Tue Jun 14 11:18:01 2011 +0200

	Make sure that the regression test
	openjdk/jdk/test/tools/jar/ChangeDir.java deletes all its work
	files.


diffstat:

 ChangeLog                     |   8 ++++++++
 Makefile.am                   |   3 ++-
 patches/jtreg-ChangeDir.patch |  32 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletions(-)

diffs (65 lines):

diff -r 038d0687d646 -r cfb9d61da90f ChangeLog
--- a/ChangeLog	Mon Jun 13 17:13:51 2011 -0400
+++ b/ChangeLog	Tue Jun 14 11:18:01 2011 +0200
@@ -1,3 +1,11 @@
+2011-06-14  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: added new patch
+	* patches/jtreg-ChangeDir.patch:
+	Make sure that the regression test
+	openjdk/jdk/test/tools/jar/ChangeDir.java
+	deletes all its work files.
+
 2011-05-23  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add security patches.
diff -r 038d0687d646 -r cfb9d61da90f Makefile.am
--- a/Makefile.am	Mon Jun 13 17:13:51 2011 -0400
+++ b/Makefile.am	Tue Jun 14 11:18:01 2011 +0200
@@ -351,7 +351,8 @@
 	patches/openjdk/7037939-hugepage.patch \
 	patches/openjdk/7043564-hugepage.patch \
 	patches/openjdk/mutter.patch \
-	patches/fonts-rhel-version.patch
+	patches/fonts-rhel-version.patch \
+	patches/jtreg-ChangeDir.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 038d0687d646 -r cfb9d61da90f patches/jtreg-ChangeDir.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-ChangeDir.patch	Tue Jun 14 11:18:01 2011 +0200
@@ -0,0 +1,33 @@
+--- openjdk.orig/jdk/test/tools/jar/ChangeDir.java	2011-05-26 16:13:43.000000000 +0200
++++ openjdk/jdk/test/tools/jar/ChangeDir.java	2011-05-27 10:59:45.000000000 +0200
+@@ -63,11 +63,14 @@
+ 
+     static void doTest(String sep) throws Throwable {
+         File testDir = null;
++        File parentDir = null;
+         JarFile jf = null;
++        File tempFile = null;
+         try {
+             // Create a subdirectory "a/b"
+-            File f = File.createTempFile("delete", ".me");
+-            String dirName = f.getParent();
++            tempFile = File.createTempFile("delete", ".me");
++            String dirName = tempFile.getParent();
++            parentDir = new File(dirName + sep + "a");
+             testDir = new File(dirName + sep + "a" + sep + "b");
+             cleanup(testDir);
+             check(testDir.mkdirs());
+@@ -109,6 +112,13 @@
+                 jf.close();
+             }
+             cleanup(testDir);
++            // clean all garbage recently created in temporary directory
++            if (parentDir != null) {
++                parentDir.delete();
++            }
++            if (tempFile != null) {
++                tempFile.delete();
++            }
+         }
+     }
+