/hg/icedtea6: Correction of testcase java/awt/FontClass/CreateFo...

[ptisnovs at icedtea.classpath.org]

changeset 31705b7b612c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=31705b7b612c
author: ptisnovs
date: Tue Nov 16 16:02:46 2010 +0100

	Correction of testcase java/awt/FontClass/CreateFont/DeleteFont. The
	test now ignores directory created by HS.


diffstat:

3 files changed, 28 insertions(+), 1 deletion(-)
ChangeLog                      |    6 ++++++
Makefile.am                    |    3 ++-
patches/jtreg-DeleteFont.patch |   20 ++++++++++++++++++++

diffs (50 lines):

diff -r ad1c77031a41 -r 31705b7b612c ChangeLog
--- a/ChangeLog	Fri Nov 12 18:17:22 2010 +0000
+++ b/ChangeLog	Tue Nov 16 16:02:46 2010 +0100
@@ -1,3 +1,9 @@ 2010-11-12  Andrew John Hughes  <ahughes
+2010-11-15  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	* patches/jtreg-DeleteFont.patch:
+	Testcase correction - the test now ignores directory created by HS.
+
 2010-11-12  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r ad1c77031a41 -r 31705b7b612c Makefile.am
--- a/Makefile.am	Fri Nov 12 18:17:22 2010 +0000
+++ b/Makefile.am	Tue Nov 16 16:02:46 2010 +0100
@@ -300,7 +300,8 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6622432-bigdecimal_performance.patch \
 	patches/openjdk/6850606-bigdecimal_regression.patch \
 	patches/openjdk/6876282-bigdecimal_divide.patch \
-	patches/f14-fonts.patch
+	patches/f14-fonts.patch \
+	patches/jtreg-DeleteFont.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r ad1c77031a41 -r 31705b7b612c patches/jtreg-DeleteFont.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-DeleteFont.patch	Tue Nov 16 16:02:46 2010 +0100
@@ -0,0 +1,20 @@
+--- 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