------------------------------------------------------------
revno: 615
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk7
timestamp: Sat 2017-05-20 16:25:19 -0700
message:
openjdk-7 (7u131-2.6.9-3) experimental; urgency=medium
* Only include the failing tests in the packages, not the whole test world.
* openjdk-7-jdk: Provide openjdk-7-jdk-headless.
-- Matthias Klose <d...@ubuntu.com> Sat, 20 May 2017 15:52:17 -0700
modified:
changelog
control
control.in
rules
--
lp:~openjdk/openjdk/openjdk7
https://code.launchpad.net/~openjdk/openjdk/openjdk7
Your team Debian Java Maintainers is subscribed to branch
lp:~openjdk/openjdk/openjdk7.
To unsubscribe from this branch go to
https://code.launchpad.net/~openjdk/openjdk/openjdk7/+edit-subscription
=== modified file 'changelog'
--- changelog 2017-05-17 04:47:17 +0000
+++ changelog 2017-05-20 23:25:19 +0000
@@ -1,3 +1,10 @@
+openjdk-7 (7u131-2.6.9-3) experimental; urgency=medium
+
+ * Only include the failing tests in the packages, not the whole test world.
+ * openjdk-7-jdk: Provide openjdk-7-jdk-headless.
+
+ -- Matthias Klose <d...@ubuntu.com> Sat, 20 May 2017 15:52:17 -0700
+
openjdk-7 (7u131-2.6.9-2) experimental; urgency=high
[ Tiago Stürmer Daitx ]
=== modified file 'control'
--- control 2017-05-16 21:00:26 +0000
+++ control 2017-05-20 23:25:19 +0000
@@ -30,7 +30,7 @@
Depends: openjdk-7-jre (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: libxt-dev
Suggests: openjdk-7-demo, openjdk-7-source, visualvm
-Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk, java7-sdk, java-compiler
+Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk, java7-sdk, java-compiler, openjdk-7-jdk-headless
Description: OpenJDK Development Kit (JDK)
OpenJDK is a development environment for building applications,
applets, and components using the Java programming language.
=== modified file 'control.in'
--- control.in 2017-05-16 21:00:26 +0000
+++ control.in 2017-05-20 23:25:19 +0000
@@ -30,7 +30,7 @@
Depends: @basename@-jre (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: libxt-dev
Suggests: @basename@-demo, @basename@-source, visualvm
-Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk, java7-sdk, java-compiler
+Provides: java-sdk, java2-sdk, java5-sdk, java6-sdk, java7-sdk, java-compiler, @basename@-jdk-headless
Description: OpenJDK Development Kit (JDK)
OpenJDK is a development environment for building applications,
applets, and components using the Java programming language.
=== modified file 'rules'
--- rules 2017-05-17 04:47:17 +0000
+++ rules 2017-05-20 23:25:19 +0000
@@ -410,7 +410,7 @@
debian/patches/kfreebsd-support-jdk.diff \
debian/patches/kfreebsd-support-hotspot.diff \
debian/patches/kfreebsd-support-corba.diff
-
+
ifeq (,$(filter noaltjamvm, $(DEB_BUILD_OPTIONS)))
ifneq (,$(filter $(DEB_HOST_ARCH), $(jamvm_archs)))
DISTRIBUTION_PATCHES += debian/patches/kfreebsd-support-jamvm.diff
@@ -1100,7 +1100,7 @@
build-arch: build
build-indep: build
-build: pre-build debian/control $(build_stamps)
+build: pre-build $(build_stamps)
if [ -f buildwatch.pid ]; then \
pid=$$(cat buildwatch.pid); \
kill -1 $$pid || :; sleep 1; kill -9 $$pid || :; \
@@ -1240,6 +1240,13 @@
build/test/langtools \
build/test/jtreg-$(VMNAME)
+ -for i in hotspot langtools jdk; do \
+ for t in $$(egrep '^(FAILED|Error)' build/test/jtreg-$(VMNAME)/check-$$i.log | grep -v '^Error: Some tests failed' | sed 's/.* \(.*\)\.[^.][^.]*$$/\1/'); do \
+ echo test/jtreg-$(VMNAME)/$$i/JTwork/$$t.jtr; \
+ done; \
+ done > build/test/failed_tests-$(VMNAME).list; \
+ XZ_DEFAULTS=-9v tar -C build -c -J -f build/test/failed_tests-$(VMNAME).tar.xz -T build/test/failed_tests-$(VMNAME).list
+
@echo "BEGIN jtreg-summary-$(VMNAME)"
-cat build/test/jtreg-$(VMNAME)/jtreg-summary.log
@echo "END jtreg-summary-$(VMNAME)"
@@ -1806,12 +1813,25 @@
# pass vm name as first argument
define install_test_results
mkdir -p $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)
- -cp build/mauve-$(1)/mauve_output-$(1) \
- $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/mauve_output-$(1).log
- -cp build/test/jtreg_output-$(1) \
- $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/jtreg_output-$(1).log
- -cp -r build/test/jtreg-$(1) \
- $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/
+ if [ -f build/mauve-$(1)/mauve_output-$(1) ]; then \
+ cp build/mauve-$(1)/mauve_output-$(1) \
+ $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/mauve_output-$(1).log; \
+ xz -9v $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/mauve_output-$(1).log; \
+ fi
+ if [ -f build/test/jtreg_output-$(1) ]; then \
+ cp build/test/jtreg_output-$(1) \
+ $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/jtreg_output-$(1).log; \
+ xz -9v $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/jtreg_output-$(1).log; \
+ fi
+ if [ -f build/test/jtreg-$(1)/jtreg-summary.log ]; then \
+ cp build/test/jtreg-$(1)/jtreg-summary.log \
+ $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/jtreg-summary-$(1).log; \
+ xz -9v $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/jtreg-summary-$(1).log; \
+ fi
+ if [ -f build/test/failed_tests-$(1).tar.xz ]; then \
+ cp -p build/test/failed_tests-$(1).tar.xz \
+ $(d_jdk)/usr/share/doc/$(p_jrehl)/test-$(DEB_HOST_ARCH)/.; \
+ fi
endef
# Build architecture dependant packages
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
