Mercurial > hg > release > icedtea7-2.0

changeset 2398:526e140c51c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Thu, 19 May 2011 23:32:31 +0100
parents bc3f282f0bc5 (current diff) 094536f66773 (diff)
children decad30090ca
files ChangeLog Makefile.am
diffstat 2 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 19 23:28:51 2011 +0100
+++ b/ChangeLog	Thu May 19 23:32:31 2011 +0100
@@ -40,6 +40,22 @@
 	Fix icedtea-boot build with --enable-jamvm
 	(stamps/icedtea-boot.stamp): Add stamps/jamvm.stamp
 
+2011-05-20  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am:
+	(HOTSPOT_CHANGESET): Test enhancement - make the test compatible with
+	OpenJDK7/IcedTea7, disabling printing unnecessary information to error
+	output.
+	(HOTSPOT_SHA256SUM): Likewise
+
+2011-05-19  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* Makefile.am:
+	(JDK_CHANGESET): Fixed behaviour of regression test
+	PrintAllXcheckJNI.java, added check if test frame is really initialized
+	to avoid exception thrown when BufferedImage is created.
+	(JDK_SHA256SUM): Likewise
+
 2011-05-18  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Thu May 19 23:28:51 2011 +0100
+++ b/Makefile.am	Thu May 19 23:32:31 2011 +0100
@@ -3,18 +3,18 @@
 OPENJDK_VERSION = b136
 
 CORBA_CHANGESET = b62418551e20
-HOTSPOT_CHANGESET = 74ff0c608935
+HOTSPOT_CHANGESET = 591c7dc0b2ee
 JAXP_CHANGESET = 1c2f25bf36b1
 JAXWS_CHANGESET = 339c2d381d80
-JDK_CHANGESET = fcc5e53dca33
+JDK_CHANGESET = 1571aa7abe47
 LANGTOOLS_CHANGESET = 8e26c4aee63c
 OPENJDK_CHANGESET = d4aea1a51d62
 
 CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac
-HOTSPOT_SHA256SUM = fe5d240d87a5680f05a80236a087a67ad7ab190d8ea92057bf5180a50d233765
+HOTSPOT_SHA256SUM = 6b2c5c9f5c1c603f742ddabb567d4abac23b91186ead4c1fc9d9643a07798e82
 JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0
 JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c
-JDK_SHA256SUM = 128026428ea4aa9068964e50df25013971c80f1ba63c600f7d15418e49031627
+JDK_SHA256SUM = 6d12de7cecd01c4ddef1a28fc393dfe5f8d66dea80b7d1484e028e8b921ac219
 LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39
 OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d