/hg/release/icedtea6-1.10: Fix hanging regression test.

[dlila at icedtea.classpath.org]

changeset 63ba95f1fccc in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=63ba95f1fccc
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 20 11:52:52 2011 -0400

	Fix hanging regression test.


diffstat:

 ChangeLog                           |   7 +++++++
 Makefile.am                         |   3 ++-
 patches/jtreg-bug7036148-test.patch |  23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletions(-)

diffs (55 lines):

diff -r e296d9a4e90b -r 63ba95f1fccc ChangeLog
--- a/ChangeLog	Wed Jun 15 13:46:13 2011 -0400
+++ b/ChangeLog	Mon Jun 20 11:52:52 2011 -0400
@@ -1,3 +1,10 @@
+2011-06-20  Denis Lila  <dlila at redhat.com>
+
+	* Makefile.am: Add patch.
+	* patches/jtreg-bug7036148-test.patch:
+	Fix regression test. It used to never end, regardless of
+	success/failure.
+
 2011-06-15  Denis Lila <dlila at redhat.com>
 
 	* Makefile.am: Apply patches.
diff -r e296d9a4e90b -r 63ba95f1fccc Makefile.am
--- a/Makefile.am	Wed Jun 15 13:46:13 2011 -0400
+++ b/Makefile.am	Mon Jun 20 11:52:52 2011 -0400
@@ -346,7 +346,8 @@
 	patches/openjdk/pgram-pipe-regression.patch \
 	patches/openjdk/mutter.patch \
 	patches/fonts-rhel-version.patch \
-	patches/openjdk/7036148-npe-null-jmenu-name.patch
+	patches/openjdk/7036148-npe-null-jmenu-name.patch \
+	patches/jtreg-bug7036148-test.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r e296d9a4e90b -r 63ba95f1fccc patches/jtreg-bug7036148-test.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-bug7036148-test.patch	Mon Jun 20 11:52:52 2011 -0400
@@ -0,0 +1,24 @@
+diff -r e7493c32e598 test/javax/swing/JMenuItem/7036148/bug7036148.java
+--- openjdk.orig/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java	Wed Jun 08 10:24:10 2011 -0700
++++ openjdk/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java	Wed Jun 15 14:25:59 2011 -0400
+@@ -44,10 +44,16 @@
+         menu.add(new JMenuItem("test"));
+         bar.add(menu);
+         setJMenuBar(bar);
+-        pack();
+     }
+ 
+-       public static void main(String[] args) {
+-            new bug7036148();
+-       }
++    public static void main(String[] args) {
++        // if the bug is present, an NPE will be thrown on pack() above.
++        JFrame f = new bug7036148();
++
++        try {
++            f.pack();
++        } finally {
++            f.dispose();
++        }
++    }
+ }