changeset in /hg/icedtea6: * patches/icedtea-testenv.patch: New ...

[Mark Wielaard]

changeset 66a924d864e4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=66a924d864e4
description:
	* patches/icedtea-testenv.patch: New patch.
		* Makefile.am (ICEDTEA_PATCHES): Add new patch.
		* HACKING: Document new patch.

diffstat:

4 files changed, 75 insertions(+), 1 deletion(-)
ChangeLog                     |    6 +++
HACKING                       |    1 
Makefile.am                   |    3 +
patches/icedtea-testenv.patch |   66 +++++++++++++++++++++++++++++++++++++++++

diffs (107 lines):

diff -r 4548cfdc09fe -r 66a924d864e4 ChangeLog
--- a/ChangeLog	Sat Nov 15 14:07:14 2008 +0100
+++ b/ChangeLog	Sun Nov 16 00:05:59 2008 +0100
@@ -1,3 +1,9 @@ 2008-11-15  Mark Wielaard  <mark at klomp.o
+2008-11-15  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-testenv.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-11-15  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-display-mode-changer.patch: New patch.
diff -r 4548cfdc09fe -r 66a924d864e4 HACKING
--- a/HACKING	Sat Nov 15 14:07:14 2008 +0100
+++ b/HACKING	Sun Nov 16 00:05:59 2008 +0100
@@ -68,6 +68,7 @@ The following patches are currently appl
 * icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
   #6761856, swing TextLayout.getBounds() returns shifted bounds.
 * icedtea-display-mode-changer.patch: Add extra test class.
+* icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 4548cfdc09fe -r 66a924d864e4 Makefile.am
--- a/Makefile.am	Sat Nov 15 14:07:14 2008 +0100
+++ b/Makefile.am	Sun Nov 16 00:05:59 2008 +0100
@@ -538,7 +538,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-f2i-overflow.patch \
 	patches/icedtea-cc-interp-no-fer.patch \
 	patches/icedtea-6761856-freetypescaler.patch \
-	patches/icedtea-display-mode-changer.patch
+	patches/icedtea-display-mode-changer.patch \
+	patches/icedtea-testenv.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 4548cfdc09fe -r 66a924d864e4 patches/icedtea-testenv.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-testenv.patch	Sun Nov 16 00:05:59 2008 +0100
@@ -0,0 +1,66 @@
+--- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2008-11-05 10:20:19.000000000 +0100
++++ openjdk/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2008-11-15 22:07:26.000000000 +0100
+@@ -40,7 +40,7 @@
+         InetAddress bogus = InetAddress.getByName("0.0.0.0");
+         SocketChannel sc = SocketChannel.open();
+         InetSocketAddress saddr = new InetSocketAddress(
+-            InetAddress.getByName(TestEnv.getProperty("host")), 23);
++            InetAddress.getByName(TestEnv.getProperty("host")), 7);
+ 
+         //Test1: connect only
+         sc.connect(saddr);
+--- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2008-11-05 10:20:19.000000000 +0100
++++ openjdk/jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2008-11-15 22:07:51.000000000 +0100
+@@ -35,7 +35,7 @@
+ 
+     public static void main(String args[]) throws Exception {
+         InetSocketAddress sa = new InetSocketAddress(
+-            InetAddress.getByName(TestEnv.getProperty("host")), 23);
++            InetAddress.getByName(TestEnv.getProperty("host")), 7);
+         SocketChannel sc = SocketChannel.open(sa);
+         boolean before = sc.socket().isInputShutdown();
+         sc.socket().shutdownInput();
+--- ../openjdk6/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2008-11-05 10:21:00.000000000 +0100
++++ openjdk/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2008-11-15 22:58:14.000000000 +0100
+@@ -26,14 +26,19 @@
+ 
+ # @test
+ # @bug 4763315
+-# @build CanonicalName Lookup 
++# @library ../../../../..
++# @build CanonicalName Lookup TestEnv
+ # @run shell/timeout=120 cname.sh
+ # @summary Test DNS provider's handling of CNAME records
+ 
+ 
+ # The host that we try to resolve
+ 
+-HOST=webcache.sfbay.sun.com
++CLASSPATH=${TESTCLASSES}
++export CLASSPATH
++JAVA="${TESTJAVA}/bin/java"
++
++HOST=`$JAVA TestEnv -get far_host`
+ 
+ # fail gracefully if DNS is not configured or there 
+ # isn't a CNAME record.
+--- openjdk.orig/jdk/test/TestEnv.java	2008-11-05 10:16:16.000000000 +0100
++++ openjdk/jdk/test/TestEnv.java	2008-11-15 22:42:11.000000000 +0100
+@@ -65,14 +65,14 @@
+         // Reachable host with the following services running:
+         // - echo service (port 7)
+         // - day time port (port 13)
+-        { "host", "javaweb.sfbay.sun.com"  },
++        { "host", "icedtea.classpath.org"  },
+ 
+         // Reachable host that refuses connections to port 80
+-        { "refusing_host", "jano1.sfbay.sun.com" },
++        { "refusing_host", "ns1.gnu.org" },
+ 
+         // Reachable host that is of sufficient hops away that a connection
+         // takes a while to be established (connect doesn't complete immediatly)
+-        { "far_host", "irejano.ireland.sun.com" },
++        { "far_host", "developer.classpath.org" },
+ 
+         // Hostname that cannot be resolved by named service
+         { "unresovable_host", "blah-blah.blah-blah.blah" },