[SCM] jigsaw packaging branch, master, updated. c0b1a71ca30c907278b5b7f0a5a1b412a997982a
Guillaume Mazoyer
gmazoyer-guest at alioth.debian.org
Thu Aug 18 13:00:09 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jigsaw packaging".
The branch, master has been updated
via c0b1a71ca30c907278b5b7f0a5a1b412a997982a (commit)
from da187a22239cbb6674327671daf280dedb3dd16d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c0b1a71ca30c907278b5b7f0a5a1b412a997982a
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date: Thu Aug 18 14:59:43 2011 +0200
More work on the debian-wip directory.
Add some patches for tests.
Add some missing build dependencies.
-----------------------------------------------------------------------
Summary of changes:
debian-wip/control | 4 +-
debian-wip/patches/02_jtreg_binary.patch | 68 ++++++++++++++++++++++++++++++
debian-wip/patches/03_hosts_tests.patch | 67 +++++++++++++++++++++++++++++
debian-wip/patches/04_junit_jar.patch | 17 +++++++
debian-wip/patches/series | 3 +
debian-wip/rules | 3 +
6 files changed, 161 insertions(+), 1 deletions(-)
diff --git a/debian-wip/control b/debian-wip/control
index 4b1d7ab..ecbf370 100644
--- a/debian-wip/control
+++ b/debian-wip/control
@@ -9,10 +9,12 @@ Build-Depends: ant,
autotools-dev,
cpio,
dbus-x11 | twm,
- debhelper (>= 5),
+ debhelper (>= 7.0.50~),
fastjar (>= 2:0.96-0ubuntu2),
g++-4.6,
gawk,
+ jtreg,
+ junit,
libasound2-dev,
libcups2-dev,
libffi-dev,
diff --git a/debian-wip/patches/02_jtreg_binary.patch b/debian-wip/patches/02_jtreg_binary.patch
new file mode 100644
index 0000000..9d3697c
--- /dev/null
+++ b/debian-wip/patches/02_jtreg_binary.patch
@@ -0,0 +1,68 @@
+## Description: Fix path to the jtreg and jtdiff binaries
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: jigsaw-1.8/hotspot/test/Makefile
+===================================================================
+--- jigsaw-1.8.orig/hotspot/test/Makefile 2011-08-18 14:07:19.855046528 +0200
++++ jigsaw-1.8/hotspot/test/Makefile 2011-08-18 14:04:58.386345027 +0200
+@@ -137,7 +137,7 @@
+ # jtreg tests
+
+ # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
+-JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
++JT_HOME = /usr
+ ifdef JPRT_JTREG_HOME
+ JT_HOME = $(JPRT_JTREG_HOME)
+ endif
+@@ -149,7 +149,7 @@
+ endif
+
+ # Default JTREG to run (win32 script works for everybody)
+-JTREG = $(JT_HOME)/win32/bin/jtreg
++JTREG = $(JT_HOME)/bin/jtreg
+
+ # Option to tell jtreg to not run tests marked with "ignore"
+ ifeq ($(PLATFORM), windows)
+Index: jigsaw-1.8/jdk/test/Makefile
+===================================================================
+--- jigsaw-1.8.orig/jdk/test/Makefile 2011-08-18 14:07:03.658966216 +0200
++++ jigsaw-1.8/jdk/test/Makefile 2011-08-18 14:05:17.546440023 +0200
+@@ -353,7 +353,7 @@
+
+ # Expect JT_HOME to be set for jtreg tests. (home for jtreg)
+ ifndef JT_HOME
+- JT_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
++ JT_HOME = /usr
+ ifdef JPRT_JTREG_HOME
+ JT_HOME = $(JPRT_JTREG_HOME)
+ endif
+@@ -634,7 +634,7 @@
+ # ------------------------------------------------------------------
+
+ # Default JTREG to run (win32 script works for everybody)
+-JTREG = $(JT_HOME)/win32/bin/jtreg
++JTREG = $(JT_HOME)/bin/jtreg
+ # Add any extra options (samevm etc.)
+ JTREG_BASIC_OPTIONS += $(EXTRA_JTREG_OPTIONS)
+ # Only run automatic tests
+Index: jigsaw-1.8/langtools/test/Makefile
+===================================================================
+--- jigsaw-1.8.orig/langtools/test/Makefile 2011-08-18 14:05:53.850620057 +0200
++++ jigsaw-1.8/langtools/test/Makefile 2011-08-18 14:03:18.213848295 +0200
+@@ -69,13 +69,9 @@
+ endif
+
+ # Default JTREG to run
+-ifdef JPRT_JTREG_HOME
+- JTREG_HOME = $(JPRT_JTREG_HOME)
+-else
+- JTREG_HOME = $(SLASH_JAVA)/re/jtreg/4.0/promoted/latest/binaries/jtreg
+-endif
+-JTREG = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtreg
+-JTDIFF = $(JTREG_HOME)/$(JT_PLATFORM)/bin/jtdiff
++JTREG_HOME = /usr
++JTREG = $(JTREG_HOME)/bin/jtreg
++JTDIFF = $(JTREG_HOME)/bin/jtdiff
+
+ # Default JCK to run
+ ifdef JPRT_JCK_HOME
diff --git a/debian-wip/patches/03_hosts_tests.patch b/debian-wip/patches/03_hosts_tests.patch
new file mode 100644
index 0000000..4219efa
--- /dev/null
+++ b/debian-wip/patches/03_hosts_tests.patch
@@ -0,0 +1,67 @@
+## Description: Change hosts to reach during the tests
+## Origin/Author: Guillaume Mazoyer (based on IcedTea)
+## Bug: bug URL
+Index: jigsaw-1.8/jdk/test/java/net/InetAddress/ptr/lookup.sh
+===================================================================
+--- jigsaw-1.8.orig/jdk/test/java/net/InetAddress/ptr/lookup.sh 2011-08-18 14:20:57.363100332 +0200
++++ jigsaw-1.8/jdk/test/java/net/InetAddress/ptr/lookup.sh 2011-08-18 14:17:59.382217776 +0200
+@@ -33,7 +33,7 @@
+
+ # The host that we try to resolve
+
+-HOST=javaweb.sfbay.sun.com
++HOST=icedtea.classpath.org
+
+ CLASSPATH=${TESTCLASSES}
+ export CLASSPATH
+Index: jigsaw-1.8/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java
+===================================================================
+--- jigsaw-1.8.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2011-08-18 14:21:00.195114371 +0200
++++ jigsaw-1.8/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java 2011-08-18 14:11:31.884296272 +0200
+@@ -39,7 +39,7 @@
+ static void test1() throws Exception {
+ InetAddress bogus = InetAddress.getByName("0.0.0.0");
+ InetSocketAddress saddr = new InetSocketAddress(
+- InetAddress.getByName(TestUtil.HOST), 23);
++ InetAddress.getByName(TestUtil.HOST), 7);
+
+ //Test1: connect only
+ SocketChannel sc = SocketChannel.open();
+Index: jigsaw-1.8/jdk/test/java/nio/channels/TestUtil.java
+===================================================================
+--- jigsaw-1.8.orig/jdk/test/java/nio/channels/TestUtil.java 2011-08-18 14:20:59.931113062 +0200
++++ jigsaw-1.8/jdk/test/java/nio/channels/TestUtil.java 2011-08-18 14:16:56.857907734 +0200
+@@ -36,9 +36,9 @@
+
+ // Test hosts used by the channels tests - change these when
+ // executing in a different network.
+- public static final String HOST = "javaweb.sfbay.sun.com";
+- public static final String REFUSING_HOST = "jano1.sfbay.sun.com";
+- public static final String FAR_HOST = "irejano.ireland.sun.com";
++ public static final String HOST = "icedtea.classpath.org";
++ public static final String REFUSING_HOST = "ns1.gnu.org";
++ public static final String FAR_HOST = "developer.classpath.org";
+ public static final String UNRESOLVABLE_HOST = "blah-blah.blah-blah.blah";
+
+ private TestUtil() { }
+Index: jigsaw-1.8/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh
+===================================================================
+--- jigsaw-1.8.orig/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh 2011-08-18 14:21:05.939142859 +0200
++++ jigsaw-1.8/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh 2011-08-18 14:18:49.542466499 +0200
+@@ -26,6 +26,7 @@
+
+ # @test
+ # @bug 4763315
++# @library ../../../../..
+ # @build CanonicalName Lookup
+ # @run shell/timeout=120 cname.sh
+ # @summary Test DNS provider's handling of CNAME records
+@@ -42,6 +43,8 @@
+ export CLASSPATH
+ JAVA="${TESTJAVA}/bin/java"
+
++HOST=`$JAVA TestEnv -get far_host`
++
+ sh -xc "$JAVA CanonicalName $HOST" 2>&1
+ if [ $? != 0 ]; then
+ echo "DNS not configured or host doesn't resolve to CNAME record"
diff --git a/debian-wip/patches/04_junit_jar.patch b/debian-wip/patches/04_junit_jar.patch
new file mode 100644
index 0000000..5d84ec9
--- /dev/null
+++ b/debian-wip/patches/04_junit_jar.patch
@@ -0,0 +1,17 @@
+## Description: Give junit.jar in jtreg classpath
+## Origin/Author: Tom Marble
+## Bug: bug URL
+Index: jigsaw-1.8/jdk/test/Makefile
+===================================================================
+--- jigsaw-1.8.orig/jdk/test/Makefile 2011-08-18 14:28:38.901388980 +0200
++++ jigsaw-1.8/jdk/test/Makefile 2011-08-18 14:27:14.012968029 +0200
+@@ -655,6 +655,9 @@
+ # Boost the max memory for jtreg to avoid gc thrashing
+ JTREG_MEMORY_OPTION = -J-Xmx512m
+ JTREG_BASIC_OPTIONS += $(JTREG_MEMORY_OPTION)
++# Junit JAR path
++JTREG_JUNIT_OPTION = -cpa:/usr/share/java/junit.jar
++JTREG_BASIC_OPTIONS += $(JTREG_JUNIT_OPTION)
+
+ # Make sure jtreg exists
+ $(JTREG): $(JT_HOME)
diff --git a/debian-wip/patches/series b/debian-wip/patches/series
index 9d9ff60..5ef4e32 100644
--- a/debian-wip/patches/series
+++ b/debian-wip/patches/series
@@ -1 +1,4 @@
01_jpkg_fix.patch
+02_jtreg_binary.patch
+03_hosts_tests.patch
+04_junit_jar.patch
diff --git a/debian-wip/rules b/debian-wip/rules
index 4bf5d6b..29d95db 100755
--- a/debian-wip/rules
+++ b/debian-wip/rules
@@ -18,5 +18,8 @@ dh_override_auto_build:
$(MAKE) all
$(MAKE) modules
+override_dh_auto_test:
+ xvfb-run -e xvfb-errors -a -s -ac $(MAKE) test -k
+
%:
dh $@
hooks/post-receive
--
jigsaw packaging
More information about the pkg-java-commits
mailing list