[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-255-g2a632dd
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 2a632ddabf45572e7e84ca7843db7dda5f8de6a0
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Mar 15 18:04:00 2013 +0100
add junit subsequentcheck as autopkgtest
diff --git a/changelog b/changelog
index df3c42a..fa7454b 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:4.0.2~rc1-0ubuntu1~raring1~ppa1) raring; urgency=low
* merge from Debian at a2aaf1c26fa02e8e0e186d8d1b255628e6f11a3d
+ * add junit subsequentcheck as autopkgtest
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 11 Mar 2013 14:59:03 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 15 Mar 2013 17:49:06 +0100
libreoffice (1:4.0.2~rc1-1) UNRELEASED; urgency=low
diff --git a/control.in b/control.in
index 4f7eb97..91e47f9 100644
--- a/control.in
+++ b/control.in
@@ -3,6 +3,7 @@ Section: editors
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
+XS-Testsuite: autopkgtest
Uploaders: Rene Engelhard <rene@debian.org>
Build-Depends: autoconf,
automake,
diff --git a/rules b/rules
index 000ee11..e2bf221 100755
--- a/rules
+++ b/rules
@@ -810,7 +810,7 @@ ifeq "$(ENABLE_JAVA)" "y"
else
BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
- GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
+ GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-//)
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
@@ -1359,6 +1359,8 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
-e "s#@PYTHON2_VERSION@#$(PYTHON2_VERSION)#g" \
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
+ sed -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
+ < debian/tests/control.in > debian/tests/control
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
@@ -1615,6 +1617,11 @@ endif
touch $@
+.PHONY: config_host.mk
+config_host.mk:
+ rm -f config.status autogen.lastrun
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
+
build:
$(CURDIR)/debian/rules build-arch
$(CURDIR)/debian/rules build-indep
diff --git a/tests/control.in b/tests/control.in
new file mode 100644
index 0000000..67ba81c
--- /dev/null
+++ b/tests/control.in
@@ -0,0 +1,34 @@
+Tests: junit-subsequentcheck
+Depends: autoconf,
+ automake,
+ bc,
+ bison,
+ build-essentials,
+ bzip2,
+ dpkg-dev (>= 1.16.1),
+ fastjar,
+ flex | flex-old,
+ gperf,
+ libarchive-zip-perl,
+ libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
+ libcups2-dev,
+ libfontconfig1-dev,
+ libfreetype6-dev,
+ libice-dev,
+ libreoffice-subsequentcheckbase,
+ libsm-dev,
+ libx11-dev,
+ libxaw7-dev,
+ libxext-dev,
+ libxinerama-dev,
+ libxkbfile-dev,
+ libxml-parser-perl,
+ libxt-dev,
+ libxtst-dev,
+ pkg-config,
+ unzip,
+ x11proto-render-dev,
+ xsltproc,
+ zip,
+ zlib1g-dev,
+ %BUILD_DEPS%
diff --git a/tests/junit-subsequentcheckbase b/tests/junit-subsequentcheckbase
new file mode 100755
index 0000000..f59d29d
--- /dev/null
+++ b/tests/junit-subsequentcheckbase
@@ -0,0 +1,38 @@
+#!/bin/sh
+# autopkgtest check: Run junit base tests against an installed version of LibreOffice
+# (C) 2013 Canonical Ltd.
+# Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+
+set -e
+
+SRCDIR=`pwd`
+WORKDIR=`mktemp -d`
+trap "rm -rf ${WORKDIR}" 0 INT QUIT ABRT PIPE TERM
+echo $WORKDIR
+
+# lets get our own copy as we make it dirty
+cp -a ${SRCDIR} ${WORKDIR}
+cd ${WORKDIR}/*
+
+# patch the tree to only build Java-based unittests against an existing installation
+patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
+
+make clean
+./debian/rules config_host.mk
+echo "include config_host.mk" > FindDefaultParallelismMakefile
+echo "all:" >> FindDefaultParallelismMakefile
+echo "\t@echo \$(CHECK_PARALLELISM)" >> FindDefaultParallelismMakefile
+DEFAULT_CHECK_PARALLELISM=`make -f FindDefaultParallelismMakefile`
+CHECK_PARALLELISM=${2:-${DEFAULT_CHECK_PARALLELISM}}
+OOO_TEST_SOFFICE="${1:-path:/usr/lib/libreoffice/program/soffice}"
+
+# yes, we want core dumps and stack traces
+ulimit -c unlimited
+
+echo "Starting subsequentcheck with ${CHECK_PARALLELISM} job against ${OOO_TEST_SOFFICE}"
+
+make -rkj ${CHECK_PARALLELISM} \
+ -f Makefile.post \
+ OOO_TEST_SOFFICE=${OOO_TEST_SOFFICE} \
+ bridges_SELECTED_BRIDGE=foo \
+ subsequentcheck
diff --git a/tests/patches/java-subsequentcheck-standalone.diff b/tests/patches/java-subsequentcheck-standalone.diff
new file mode 100644
index 0000000..383e379
--- /dev/null
+++ b/tests/patches/java-subsequentcheck-standalone.diff
@@ -0,0 +1,141 @@
+From 4224d61427370149e9a9f5bd20cd9549e535398f Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Tue, 30 Oct 2012 15:37:35 +0100
+Subject: [PATCH] run subsequentcheck standalone against installed version as
+ integration test
+Forwarded: partially, where there is generic use for it
+
+---
+ dbaccess/Module_dbaccess.mk | 1 -
+ jurt/Module_jurt.mk | 2 +-
+ ridljar/JunitTest_util.mk | 2 +-
+ solenv/gbuild/JavaClassSet.mk | 2 +-
+ solenv/gbuild/JunitTest.mk | 2 +-
+ solenv/gbuild/Module.mk | 3 +++
+ solenv/gbuild/extensions/post_SkipBuild.mk | 17 +++++++++++++++++
+ solenv/gbuild/platform/unxgcc.mk | 2 +-
+ 8 files changed, 25 insertions(+), 6 deletions(-)
+ create mode 100644 solenv/gbuild/extensions/post_SkipBuild.mk
+
+diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
+index f087ba8..1ee0bd6 100644
+--- a/dbaccess/Module_dbaccess.mk
++++ b/dbaccess/Module_dbaccess.mk
+@@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
+
+
+ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
+- JunitTest_dbaccess_complex \
+ JunitTest_dbaccess_unoapi \
+ ))
+
+diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
+index e367b6f..2b73ce3 100644
+--- a/jurt/Module_jurt.mk
++++ b/jurt/Module_jurt.mk
+@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,jurt,\
+ ))
+ endif
+
+-$(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\
++#$(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\
+ CustomTarget_test_urp \
+ InternalUnoApi_test_urp \
+ JunitTest_bridgefactory \
+diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
+index e29a65b..da374a7 100644
+--- a/ridljar/JunitTest_util.mk
++++ b/ridljar/JunitTest_util.mk
+@@ -28,7 +28,7 @@
+ $(eval $(call gb_JunitTest_JunitTest,ridljar_util))
+
+ $(eval $(call gb_JunitTest_use_jars,ridljar_util,\
+- OOoRunnerLight \
++ OOoRunner \
+ ridl \
+ ))
+
+diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
+index fab3ae4..1b581a7 100644
+--- a/solenv/gbuild/JavaClassSet.mk
++++ b/solenv/gbuild/JavaClassSet.mk
+@@ -47,7 +47,7 @@ $(call gb_Helper_abbreviate_dirs,\
+ $(filter-out $(JARDEPS),$(4))) && \
+ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
+ $(gb_JavaClassSet_JAVACDEBUG) \
+- -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
++ -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2)):$(subst $(gb_SPACE),:,$(wildcard /usr/lib/ure/share/java/*.jar)):$(subst $(gb_SPACE),:,$(wildcard /usr/lib/libreoffice/program/classes/*.jar))" \
+ -d $(call gb_JavaClassSet_get_classdir,$(2)) \
+ @$$RESPONSEFILE &&) \
+ rm -f $$RESPONSEFILE &&) \
+diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
+index 6ed1f77..716d966 100644
+--- a/solenv/gbuild/JunitTest.mk
++++ b/solenv/gbuild/JunitTest.mk
+@@ -67,7 +67,7 @@ $(call gb_JunitTest_get_target,%) :
+ $(CLEAN_CMD)
+
+ define gb_JunitTest_JunitTest
+-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib
++$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(OUTDIR)/lib:$(subst $(gb_SPACE),:,$(wildcard /usr/lib/ure/share/java/*.jar)):$(subst $(gb_SPACE),:,$(wildcard /usr/lib/libreoffice/program/classes/*.jar))
+ $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
+ $(eval $(call gb_JunitTest_JunitTest_platform,$(1)))
+
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index 97f1a81..095212b 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -255,11 +255,14 @@ endef
+ endif # SKIP_TESTS
+
+ define gb_Module_add_subsequentcheck_target
++ifeq (,$(filter-out JavaClassSet% JunitTest%,$(2)))
+ $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
+
+ $(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
+ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
+
++endif
++
+ endef
+ endif
+
+diff --git a/solenv/gbuild/extensions/post_SkipBuild.mk b/solenv/gbuild/extensions/post_SkipBuild.mk
+new file mode 100644
+index 0000000..661d638
+--- /dev/null
++++ b/solenv/gbuild/extensions/post_SkipBuild.mk
+@@ -0,0 +1,17 @@
++# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
++#
++# This file is part of the LibreOffice project.
++#
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++#
++
++# we dont want to bother with these for integration tests
++gb_Module_add_target =
++gb_Module_add_check_target =
++gb_Module_add_slowcheck_target =
++gb_JavaClassSet_use_jar =
++gb_JunitTest_use_jar =
++
++# vim: set noet sw=4 ts=4:
+diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
+index 53d51ac..0b88221 100644
+--- a/solenv/gbuild/platform/unxgcc.mk
++++ b/solenv/gbuild/platform/unxgcc.mk
+@@ -339,7 +339,7 @@ endef
+ # JunitTest class
+
+ ifneq ($(OOO_TEST_SOFFICE),)
+-gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE)
++gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE)
+ else
+ ifneq ($(gb_JunitTest_DEBUGRUN),)
+ gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
+--
+1.8.1.2
+
--
LibreOffice packaging repository
Reply to: