changeset 2422:3024025d7759

Merge
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 23 May 2011 15:52:47 +0100
parents c644df7984ad (current diff) 654b84d3de8c (diff)
children eff72c004141
files ChangeLog
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon May 23 15:48:03 2011 +0100
+++ b/ChangeLog	Mon May 23 15:52:47 2011 +0100
@@ -6,6 +6,13 @@
 	Move --enable-nss logic to IT_LOCATE_NSS macro.
 	Call IT_LOCATE_NSS macro.
 
+2011-05-23  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* test/jtreg/excludelist.jdk.jtx:
+	Added LocaleEnhanceTest to a JTreg exclude list,
+	because the test base class can not be used
+	in IcedTea due to questionable licence.
+
 2011-05-22  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/test/jtreg/excludelist.jdk.jtx	Mon May 23 15:48:03 2011 +0100
+++ b/test/jtreg/excludelist.jdk.jtx	Mon May 23 15:52:47 2011 +0100
@@ -197,3 +197,9 @@
 java/awt/FontClass/CreateFont/fileaccess/FontFile.java
 java/awt/FontClass/CreateFont/DeleteFont.sh
 java/awt/FontClass/CreateFont/bigfont.html
+
+# This test cannot be compiled because it's base class
+# LocaleTestFmwk is deleted during the "liberation" phase
+# of build process (this class has questionable licence).
+java/util/Locale/LocaleEnhanceTest.java
+