/hg/icedtea6: Regression test fix: Make sure that the regression...

[ptisnovs at icedtea.classpath.org]

changeset f5b82f792313 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f5b82f792313
author: ptisnovs
date: Thu Jun 16 13:19:25 2011 +0200

	Regression test fix: Make sure that the regression test
	openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java deletes all
	its work files.


diffstat:

 ChangeLog                   |   8 ++++++++
 Makefile.am                 |   3 ++-
 patches/jtreg-FileMap.patch |  23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletions(-)

diffs (56 lines):

diff -r 830e2c11d9f3 -r f5b82f792313 ChangeLog
--- a/ChangeLog	Wed Jun 15 15:29:46 2011 -0400
+++ b/ChangeLog	Thu Jun 16 13:19:25 2011 +0200
@@ -1,3 +1,11 @@
+2011-06-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: added new patch
+	* patches/jtreg-FileMap.patch:
+	Make sure that the regression test
+	openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java
+	deletes all its work files.
+
 2011-06-15  Danesh Dadachanji  <ddadacha at redhat.com>
 
 	* AUTHORS: Added myself.
diff -r 830e2c11d9f3 -r f5b82f792313 Makefile.am
--- a/Makefile.am	Wed Jun 15 15:29:46 2011 -0400
+++ b/Makefile.am	Thu Jun 16 13:19:25 2011 +0200
@@ -356,7 +356,8 @@
 	patches/jtreg-ChangeDir.patch \
 	patches/jtreg-TempBuffer.patch \
 	patches/jtreg-EncodedMultiByteChar.patch \
-	patches/jtreg-FileLoaderTest.patch
+	patches/jtreg-FileLoaderTest.patch \
+	patches/jtreg-FileMap.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 830e2c11d9f3 -r f5b82f792313 patches/jtreg-FileMap.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-FileMap.patch	Thu Jun 16 13:19:25 2011 +0200
@@ -0,0 +1,24 @@
+--- openjdk.orig/jdk/test/sun/net/www/protocol/file/FileMap.java	2011-02-28 17:07:06.000000000 +0100
++++ openjdk/jdk/test/sun/net/www/protocol/file/FileMap.java	2011-06-16 11:30:19.000000000 +0200
+@@ -32,8 +32,9 @@
+ 
+ public class FileMap {
+     public static void main(String[] args) {
++        File f = null;
+         try {
+-            File f = File.createTempFile("test", null);
++            f = File.createTempFile("test", null);
+             f.deleteOnExit();
+             String s = f.getAbsolutePath();
+             s = s.startsWith("/") ? s : "/" + s;
+@@ -48,5 +49,10 @@
+         } catch (Exception ex) {
+             throw new RuntimeException("Unexpected exception: " + ex);
+         }
++        finally {
++            if ( f != null ) {
++                f.delete();
++            }
++        }
+     }
+ }