Mercurial > hg > release > icedtea6-1.10
changeset 2526:63ba95f1fccc
Fix hanging regression test.
| author | Denis Lila <dlila@redhat.com> |
|---|---|
| date | Mon, 20 Jun 2011 11:52:52 -0400 |
| parents | e296d9a4e90b |
| children | 15caf12fc26d |
| files | ChangeLog Makefile.am patches/jtreg-bug7036148-test.patch |
| diffstat | 3 files changed, 33 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@redhat.com> * Makefile.am: Apply patches.
--- 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 += \
--- /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(); ++ } ++ } + }