Reviewer needed: fix for regression test jck/tools/jar/ChangeDir.java in IcedTea6 HEAD

[Jiri Vanek]

On 06/13/2011 02:50 PM, Pavel Tisnovsky wrote:

Give sense. Approved from my side.

> Hi,
>
> is it possible to add fix for regression test
> jck/tools/jar/ChangeDir.java to IcedTea6 HEAD please?
> This fix ensures that the test deletes all its work files in temporary
> directory, so it does not interfere with other tests.
>
> Fix was tested on RHEL 5.6.
>
>
> ChangeLog entry:
> 2011-06-13  Pavel Tisnovsky<ptisnovs at redhat.com>
>
>          * Makefile.am: added new patch
>          * patches/jtreg-ChangeDir.patch:
>          Make sure that the regression test
>          jck/tools/jar/ChangeDir.java delete all its work files.
>
>
> Cheers,
> Pavel
>
>
> hg_diff.patch
>
>
> 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();
> ++            }
> +         }
> +     }
> +