[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc1-1-12-g25e8bc7
The following commit has been merged in the debian-experimental-4.0 branch:
commit c308a2f330cd918310fab546f916cf9646bc0ad2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 20 23:07:47 2013 +0100
squash and cherry-pick junit autopkgtests from Ubuntu
diff --git a/changelog b/changelog
index 2e69879..8799f9a 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,6 @@
libreoffice (1:4.0.2~rc1-2) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* merge from Ubuntu:
- reverting l10n conflicts as they create an unfortunate mess in image and
installer creation (related: lp#957589)
@@ -10,6 +11,9 @@ libreoffice (1:4.0.2~rc1-2) UNRELEASED; urgency=low
- mention that python-uno is for old python2 compatibility and move to
oldlibs
+ [ Bjoern Michaelsen ]
+ * squash and cherry-pick junit autopkgtests from Ubuntu
+
-- Rene Engelhard <rene@debian.org> Wed, 13 Mar 2013 02:07:52 +0100
libreoffice (1:4.0.2~rc1-1) experimental; urgency=low
diff --git a/control b/control
index 834e7da..16aa399 100644
--- a/control
+++ b/control
@@ -162,6 +162,7 @@ Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
Standards-Version: 3.9.4
XS-Python-Version: current
XS-Python3-Version: 3.3
+XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs:
@@ -4389,6 +4390,144 @@ Description: office productivity suite -- Evolution addressbook support
This package allows LibreOffice to access Evolution address books.
You need to install evolution separately.
+Package: libreoffice-subsequentcheckbase
+Section: libs
+Priority: extra
+Architecture: all
+Depends: ant (>= 1.7.0),
+ ant-optional (>= 1.7.0),
+ autoconf,
+ automake,
+ bc,
+ bison,
+ bsh (>= 2.0b4),
+ bzip2,
+ cpp-4.7,
+ debhelper (>= 7.2.3~),
+ default-jdk,
+ dmake (>= 1:4.11),
+ doxygen,
+ dpkg-dev (>= 1.16.1),
+ fastjar,
+ flex | flex-old,
+ fontforge,
+ g++-mingw-w64-i686,
+ gcj-jdk,
+ gcj-native-helper,
+ gdb,
+ gettext,
+ gperf,
+ javahelper (>= 0.37~),
+ junit4 (>= 4.8.2-2),
+ kdelibs5-dev (>= 4:4.3.4),
+ libarchive-zip-perl,
+ libbase-java,
+ libbluetooth-dev,
+ libboost-date-time-dev (>= 1.38),
+ libboost-dev (>= 1.38),
+ libcairo2-dev,
+ libcdr-dev,
+ libclucene-dev (>= 2.3.3.4-2),
+ libcmis-dev (>= 0.3.1),
+ libcommons-codec-java,
+ libcommons-httpclient-java,
+ libcommons-lang-java,
+ libcommons-logging-java (>= 1.1.1-9),
+ libcppunit-dev (>= 1.12),
+ libcups2-dev,
+ libdbus-glib-1-dev (>= 0.70),
+ libebook1.2-dev,
+ libexpat1-dev,
+ libexttextcat-dev (>= 3.1.1),
+ libflute-java (>= 1.1.6),
+ libfontconfig1-dev,
+ libfonts-java (>= 1.1.6),
+ libformula-java (>= 1.1.7),
+ libfreetype6-dev,
+ libgcj-common (>= 1:4.4.1),
+ libgconf2-dev,
+ libgl1-mesa-dev,
+ libglib2.0-dev (>= 2.15.0),
+ libglu1-mesa-dev,
+ libgraphite2-dev (>= 0.9.3),
+ libgstreamer-plugins-base1.0-dev,
+ libgstreamer1.0-dev,
+ libgtk-3-dev (>= 3.2~),
+ libgtk2.0-dev (>= 2.10),
+ libhsqldb-java (>> 1.8.0.10),
+ libhunspell-dev (>= 1.1.5-2),
+ libhyphen-dev (>= 2.4),
+ libice-dev,
+ libicu-dev (>= 4.6),
+ libjpeg-dev,
+ liblangtag-dev (>= 0.4),
+ liblayout-java (>= 0.2.10),
+ liblcms2-dev,
+ libldap2-dev,
+ libloader-java (>= 1.1.6),
+ liblpsolve55-dev (>= 5.5.0.13-5+b1),
+ libmdds-dev (>= 0.6.0),
+ libmspub-dev,
+ libmysqlclient-dev,
+ libmysqlcppconn-dev (>= 1.1.0~r791),
+ libmythes-dev (>= 2:1.2),
+ libneon27-gnutls-dev,
+ libnss3-dev (>= 3.12.3),
+ liborbit2-dev,
+ liborcus-dev,
+ libpentaho-reporting-flow-engine-java (>= 0.9.4),
+ libpng12-dev,
+ libpoppler-cpp-dev,
+ libpoppler-dev (>= 0.8.0),
+ libpoppler-private-dev,
+ libpq-dev (>= 9.0~),
+ libqt4-dev (>= 4:4.8),
+ librdf0-dev (>= 1.0.8),
+ libreoffice,
+ librepository-java (>= 1.1.6),
+ libsac-java,
+ libsane-dev,
+ libserializer-java (>= 1.1.6),
+ libservlet2.5-java,
+ libsm-dev,
+ libssl-dev,
+ libsuitesparse-dev (>= 1:3.4.0),
+ libvigraimpex-dev,
+ libvisio-dev,
+ libwpd-dev (>= 0.9.0),
+ libwpg-dev (>= 0.2.0),
+ libwps-dev (>= 0.2.0),
+ libx11-dev,
+ libxaw7-dev,
+ libxext-dev,
+ libxinerama-dev,
+ libxkbfile-dev,
+ libxml-java (>= 1.1.6),
+ libxml-parser-perl,
+ libxml2-dev,
+ libxml2-utils,
+ libxrandr-dev,
+ libxrender-dev,
+ libxslt1-dev,
+ libxt-dev,
+ libxtst-dev,
+ lp-solve (>= 5.5.0.13-5+b1),
+ make (>= 3.81-8.2),
+ pkg-config,
+ python (>= 2.6.6-3+squeeze4),
+ python-dev (>= 2.6),
+ python3.3-dev (>= 3.3),
+ unixodbc-dev (>= 2.2.11),
+ unzip,
+ x11proto-render-dev,
+ xsltproc,
+ xulrunner-dev,
+ zip,
+ zlib1g-dev,
+ ${misc:Depends}
+Description: LibreOffice java test libraries
+ LibreOffice subsequentchecks integration test suite
+
Package: libreoffice-librelogo
Section: misc
Architecture: all
diff --git a/control.in b/control.in
index 8591a39..197d1e5 100644
--- a/control.in
+++ b/control.in
@@ -3,37 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: autoconf,
- automake,
- bc,
- bison,
- 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,
- 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%
+Build-Depends: %BUILD_DEPS%
Build-Depends-Indep: fdupes, imagemagick, xml-core, %BUILD_DEPS_INDEP%
Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%],
@@ -59,6 +29,7 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
Standards-Version: 3.9.4
XS-Python-Version: @PYTHON2_VERSION@
XS-Python3-Version: @PYTHON_VERSION_CONTROL@
+XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
Bugs: @BUGS@
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
new file mode 100644
index 0000000..e4ba9ff
--- /dev/null
+++ b/control.subsequentcheckbase.in
@@ -0,0 +1,8 @@
+Package: libreoffice-subsequentcheckbase
+Section: libs
+Priority: extra
+Architecture: all
+Depends: libreoffice, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
+Description: LibreOffice java test libraries
+ LibreOffice subsequentchecks integration test suite
+
diff --git a/rules b/rules
index 5892e6a..5e3f8fb 100755
--- a/rules
+++ b/rules
@@ -84,7 +84,37 @@ endif
#
OOO_ARCHS = amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
PATCHSET=$(DEB_VENDOR)
-BUILD_DEPS=
+BUILD_DEPS=\
+ autoconf,\
+ automake,\
+ bc,\
+ bison,\
+ 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,\
+ 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\
# These are components which can be built from internal copies, or used from the
# distribution. See configure --help for valid values (--with-system-<value>).
@@ -1330,7 +1360,6 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
- -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
-e "s#@PYTHON_VERSION_CONTROL@#$(PYTHON_VERSION_CONTROL)#g" \
-e "s#@PYTHON2_VERSION@#$(PYTHON2_VERSION)#g" \
@@ -1464,6 +1493,10 @@ endif
ifeq "$(ENABLE_KDEAB)" "y"
cat debian/control.kab.in >> debian/control
endif
+ifneq "$(OOO_JAVA_ARCHS)" ""
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.subsequentcheckbase.in
+endif
ifeq "$(PACKAGE_LIBRELOGO)" "y"
cat debian/control.librelogo.in >> debian/control
endif
@@ -1479,6 +1512,12 @@ endif
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
+ perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
+ # we want the build deps as dep on subsequentcheckbase, but strip the arch
+ # specifics as we are arch-all
+ # for now we filter out the arch-specific libc0.1 and ia64, which is ugly,
+ # but better than manual bookkeeping
+ perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice$(VER)-gnome | libreoffice$(VER)-kde/' debian/control
else
@@ -1588,6 +1627,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
@@ -2495,6 +2539,11 @@ ifeq "$(ENABLE_JAVA)" "y"
mv $(PKGDIR)-common/$(OODIR)/share/registry/$$i.xcd \
$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry; \
done
+ mkdir -p $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/
+ for jar in OOoRunner.jar OOoRunnerLight.jar test.jar test-tools.jar ConnectivityTools.jar; \
+ do \
+ mv `find solver -name $$jar` $(PKGDIR)-subsequentcheckbase/$(OODIR)/program/classes/; \
+ done
endif
# fix permissions
diff --git a/tests/control b/tests/control
new file mode 100644
index 0000000..8480fa0
--- /dev/null
+++ b/tests/control
@@ -0,0 +1,2 @@
+Tests: junit-subsequentcheck
+Depends: libreoffice-subsequentcheckbase, gdb
diff --git a/tests/junit-subsequentcheck b/tests/junit-subsequentcheck
new file mode 100644
index 0000000..e8a7ed4
--- /dev/null
+++ b/tests/junit-subsequentcheck
@@ -0,0 +1,61 @@
+#!/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`
+
+
+echo "====== checking free disc and memory space ======"
+df -h
+free
+
+trap "rm -rf ${WORKDIR}" 0 INT QUIT ABRT PIPE TERM
+
+# lets get our own copy as we make it dirty
+echo
+echo "====== Copying source from ${SRCDIR} to ${WORKDIR} ======"
+cp -a ${SRCDIR} ${WORKDIR}
+
+echo
+echo "====== Changing to directory `ls ${WORKDIR}/*` ======"
+cd ${WORKDIR}/*
+
+echo
+echo "====== Patching the tree to only build Java-based unittests against an existing installation ======"
+patch -p1 < ./debian/tests/patches/java-subsequentcheck-standalone.diff
+
+echo
+echo "====== Generating configuration ======="
+rm -f config_host.mk
+./debian/rules config_host.mk
+
+echo
+echo "====== Cleaning tree ======"
+make clean 2>&1
+
+echo
+echo "====== Determinating job count ======"
+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}"
+
+echo
+echo "====== Enabling core dumps ======"
+# yes, we want core dumps and stack traces
+ulimit -c unlimited
+
+echo
+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 2>&1
diff --git a/tests/patches/java-subsequentcheck-standalone.diff b/tests/patches/java-subsequentcheck-standalone.diff
new file mode 100644
index 0000000..ebffaf1
--- /dev/null
+++ b/tests/patches/java-subsequentcheck-standalone.diff
@@ -0,0 +1,128 @@
+From 4224d61427370149e9a9f5bd20cd9549e535398f Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Wed Mar 20 12:50:17 CET 2013
+Subject: [PATCH] run subsequentcheck standalone against installed version as
+ integration test
+Forwarded: partially, where there is generic use for it
+
+---
+ 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 +-
+ 7 files changed, 25 insertions(+), 5 deletions(-)
+ create mode 100644 solenv/gbuild/extensions/post_SkipBuild.mk
+
+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: