/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 799d1eebe117 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=799d1eebe117
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Nov 10 16:30:08 2010 +0000

	Remove additional whitespace introduced in Makefile.am.

	2010-11-10 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Remove additional whitespace.


changeset cb572d31894b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cb572d31894b
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Nov 11 21:15:23 2010 +0000

	Merge


diffstat:

3 files changed, 33 insertions(+), 3 deletions(-)
ChangeLog                                     |   10 ++++++++++
Makefile.am                                   |    5 ++---
patches/openjdk/6980392-fix_test6581734.patch |   21 +++++++++++++++++++++

diffs (71 lines):

diff -r 3b0958812397 -r cb572d31894b ChangeLog
--- a/ChangeLog	Wed Nov 10 16:07:00 2010 +0000
+++ b/ChangeLog	Thu Nov 11 21:15:23 2010 +0000
@@ -1,3 +1,13 @@ 2010-11-10  Andrew John Hughes  <ahughes
+2010-11-11  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/openjdk/6980392-fix_test6581734.patch:
+	Testcase correction - added missing right bracket.
+
+2010-11-10  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Remove additional whitespace.
+
 2010-11-10  Andrew John Hughes  <ahughes at redhat.com>
 
 	RH647737
diff -r 3b0958812397 -r cb572d31894b Makefile.am
--- a/Makefile.am	Wed Nov 10 16:07:00 2010 +0000
+++ b/Makefile.am	Thu Nov 11 21:15:23 2010 +0000
@@ -41,7 +41,6 @@ BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)
 BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
-
 
 # Source directories
 
@@ -306,7 +305,8 @@ if WITH_ALT_HSBUILD
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
 	patches/openjdk/6994130-ppc_fix.patch \
-	patches/disable-default-compoops.patch
+	patches/disable-default-compoops.patch \
+	patches/openjdk/6980392-fix_test6581734.patch
 else
 ICEDTEA_PATCHES += \
 	patches/shark_do_nothing_on_stub_frame.patch \
@@ -964,7 +964,6 @@ stamps/fonts.stamp: stamps/generated.sta
 	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.12.properties
 	mkdir -p stamps
 	touch stamps/fonts.stamp
-
 
 stamps/patch-fsg.stamp: stamps/fonts.stamp
 	mkdir -p stamps ; \
diff -r 3b0958812397 -r cb572d31894b patches/openjdk/6980392-fix_test6581734.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6980392-fix_test6581734.patch	Thu Nov 11 21:15:23 2010 +0000
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User kevinw
+# Date 1282924624 -3600
+# Node ID 21c29458b334f7b1f05a185442ab37ab8de1ea7b
+# Parent  8e5955ddf8e491a54b7e9446424fdee02e6950c8
+6980392: TEST_BUG: gc/6581734/Test6581734.java has typo
+Summary: simple correction in testcase
+Reviewed-by: mchung
+
+diff -r 8e5955ddf8e4 -r 21c29458b334 test/gc/6581734/Test6581734.java
+--- openjdk.old/hotspot/test/gc/6581734/Test6581734_.java	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.");
+     }