Mercurial > hg > release > icedtea6-1.9

changeset 2333:77b802f946bb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
S6980392, PR642: simple correction in testcase, added missing bracket
author ptisnovs
date Mon, 07 Mar 2011 17:22:45 +0100
parents e71c8f4ba044
children e4336b504f8a
files ChangeLog Makefile.am NEWS patches/openjdk/6980392-fix_test6581734.patch
diffstat 4 files changed, 21 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Feb 24 16:31:02 2011 +0100
+++ b/ChangeLog	Mon Mar 07 17:22:45 2011 +0100
@@ -1,3 +1,10 @@
+2011-03-07  Pavel Tisnovsky  <ptisnovs@redhat.co>
+
+	* Makefile.am: Add new patch.
+	* NEWS: Updated.
+	* patches/openjdk/6980392-fix_test6581734.patch:
+	Testcase correction - added missing right bracket.
+
 2011-02-24  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* Makefile.am: Add patch.
--- a/Makefile.am	Thu Feb 24 16:31:02 2011 +0100
+++ b/Makefile.am	Mon Mar 07 17:22:45 2011 +0100
@@ -345,7 +345,8 @@
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/openjdk/6994130-ppc_fix.patch \
-	patches/hotspot/hs19/ia64-fix.patch
+	patches/hotspot/hs19/ia64-fix.patch \
+	patches/openjdk/6980392-fix_test6581734.patch
 else
 ICEDTEA_PATCHES += \
 	patches/shark_do_nothing_on_stub_frame.patch \
--- a/NEWS	Thu Feb 24 16:31:02 2011 +0100
+++ b/NEWS	Mon Mar 07 17:22:45 2011 +0100
@@ -13,6 +13,7 @@
 * Backports
   - S6675802: Regression: heavyweight popups cause SecurityExceptions in applets
   - S6691503: Malicious applet can show always-on-top popup menu which has whole screen size 
+  - S6980392, PR642: simple correction in testcase, added missing bracket
 
 New in release 1.9.7 (2011-02-15):
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6980392-fix_test6581734.patch	Mon Mar 07 17:22:45 2011 +0100
@@ -0,0 +1,11 @@
+--- /dev/null	2010-10-08 22:29:24.000000000 +0200
++++ openjdk/hotspot/test/gc/6581734/Test6581734.java	2010-11-11 15:47:15.000000000 +0100
+@@ -121,7 +121,7 @@
+         }
+ 
+         if (collectorsWithTime<collectorsFound) {
+-            throw new RuntimeException("collectors found with zero time";
++            throw new RuntimeException("collectors found with zero time");
+         }
+         System.out.println("Test passed.");
+     }