diff -r c51663f190c9 Makefile.am --- a/Makefile.am Fri Jun 10 22:58:13 2011 +0100 +++ b/Makefile.am Mon Jun 13 14:47:44 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 c51663f190c9 patches/jtreg-ChangeDir.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jtreg-ChangeDir.patch Mon Jun 13 14:47:44 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(); ++ } + } + } +