/hg/icedtea6-hg: Drop jtreg-DeleteFont.patch due to backport of ...

[andrew at icedtea.classpath.org]

changeset b68332db2560 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b68332db2560
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 14 13:58:40 2011 +0000

	Drop jtreg-DeleteFont.patch due to backport of 7009828 regression
	fix.

	2011-01-13 Andrew John Hughes <ahughes at redhat.com>

	 * patches/jtreg-DeleteFont.patch: Drop patch. No
	longer needed due to backport of 7009828 upstream.
		* Makefile.am: Drop above.


diffstat:

3 files changed, 8 insertions(+), 22 deletions(-)
ChangeLog                      |    9 ++++++++-
Makefile.am                    |    1 -
patches/jtreg-DeleteFont.patch |   20 --------------------

diffs (51 lines):

diff -r 8fbbbe4af6bc -r b68332db2560 ChangeLog
--- a/ChangeLog	Thu Jan 13 09:57:38 2011 +0000
+++ b/ChangeLog	Fri Jan 14 13:58:40 2011 +0000
@@ -1,4 +1,11 @@ 2011-01-10  Andrew John Hughes  <ahughes
-2011-01-10  Andrew John Hughes  <ahughes at redhat.com>
+2011-01-13  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/jtreg-DeleteFont.patch:
+	Drop patch.  No longer needed due to backport
+	of 7009828 upstream.
+	* Makefile.am: Drop above.
+
+2011-01-13  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/openjdk/6980392-fix_test6581734.patch:
 	Remove upstreamed patch.
diff -r 8fbbbe4af6bc -r b68332db2560 Makefile.am
--- a/Makefile.am	Thu Jan 13 09:57:38 2011 +0000
+++ b/Makefile.am	Fri Jan 14 13:58:40 2011 +0000
@@ -263,7 +263,6 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6967436-6976265-6967434-pisces.patch \
 	patches/openjdk/6997495-test_correction_6857159.patch \
 	patches/f14-fonts.patch \
-	patches/jtreg-DeleteFont.patch \
 	patches/jtreg-WindowWithWarningTest.patch \
 	patches/jtreg-T6638712-fix.patch \
 	patches/jtreg-T6650759m-fix.patch \
diff -r 8fbbbe4af6bc -r b68332db2560 patches/jtreg-DeleteFont.patch
--- a/patches/jtreg-DeleteFont.patch	Thu Jan 13 09:57:38 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- openjdk-old/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.sh	2010-06-21 23:15:49.000000000 +0200
-+++ openjdk/jdk/test/java/awt/FontClass/CreateFont/DeleteFont.sh	2010-11-15 14:13:13.000000000 +0100
-@@ -46,7 +46,7 @@
- 
- cd ${TESTCLASSES}
- 
--numfiles0=`ls ${TESTCLASSES} | wc -l`
-+numfiles0=`ls ${TESTCLASSES} | grep -v "^hsperfdata*" | wc -l`
- ${TESTJAVA}/bin/java -Djava.io.tmpdir=${TESTCLASSES} DeleteFont
- 
- if [ $? -ne 0 ]
-@@ -55,7 +55,7 @@
-       exit 1
- fi
- 
--numfiles1=`ls ${TESTCLASSES} | wc -l`
-+numfiles1=`ls ${TESTCLASSES} | grep -v "^hsperfdata*" | wc -l`
- 
- if [ $numfiles0 -ne $numfiles1 ]
-     then