[libreoffice] 01/05: add initial (not yet working for writer_demo) version of autopgktest running uitest

Rene Engelhard rene at moszumanska.debian.org
Tue Jun 20 05:09:45 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 59eddd6e4fa23a2607d0a47623b891250278e274
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jun 19 00:08:03 2017 +0200

    add initial (not yet working for writer_demo) version of autopgktest running uitest
---
 changelog                             |  6 ++++-
 tests/control                         |  4 +++
 tests/control.in                      |  4 +++
 tests/patches/uicheck-standalone.diff | 35 ++++++++++++++++++++++++++
 tests/uicheck                         | 46 +++++++++++++++++++++++++++++++++++
 5 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 3f308e8..058594e 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,11 @@ libreoffice (1:5.4.0~rc1~git20170616-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
- -- Rene Engelhard <rene at debian.org>  Mon, 12 Jun 2017 23:44:55 +0200
+  * debian/tests/control.in, debian/tests/uicheck,
+    debian/tests/patches/uicheck-standalone.diff: add initial
+    (not yet working for writer_demo) version of autopgktest running uitest 
+
+ -- Rene Engelhard <rene at debian.org>  Sun, 18 Jun 2017 23:36:53 +0200
 
 libreoffice (1:5.4.0~beta2-4) experimental; urgency=medium
 
diff --git a/tests/control b/tests/control
index 5d95a3a..00242d7 100644
--- a/tests/control
+++ b/tests/control
@@ -4,5 +4,9 @@ Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb,
 Tests: pyuno-import
 Depends: python3-uno
 
+Tests: uicheck
+Depends: libreoffice, python3, python3-uno, locales, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) , libpcr [...]
+Restrictions: build-needed
+
 Tests: sdk-examples
 Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk
diff --git a/tests/control.in b/tests/control.in
index 2233c44..f131a29 100644
--- a/tests/control.in
+++ b/tests/control.in
@@ -4,5 +4,9 @@ Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb,
 Tests: pyuno-import
 Depends: python3-uno
 
+Tests: uicheck
+Depends: libreoffice, python3, python3-uno, locales, %BUILD_DEPS_ARCH_ALL%, build-essential, default-jdk
+Restrictions: build-needed
+
 Tests: sdk-examples
 Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk
diff --git a/tests/patches/uicheck-standalone.diff b/tests/patches/uicheck-standalone.diff
new file mode 100644
index 0000000..1f7463c
--- /dev/null
+++ b/tests/patches/uicheck-standalone.diff
@@ -0,0 +1,35 @@
+diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
+index 1edb3f769081..62d54917951b 100644
+--- a/solenv/gbuild/UITest.mk
++++ b/solenv/gbuild/UITest.mk
+@@ -51,15 +54,15 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS)
+ 		$(DEFS) \
+ 		SAL_LOG_FILE="$(dir $(call gb_UITest_get_target,$*))/soffice.out.log" \
+ 		TEST_LIB=$(call gb_Library_get_target,test) \
+-		URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \
+-		PYTHONPATH="$(PYPATH)" \
++		URE_BOOTSTRAP=vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc \
++		PYTHONPATH="$(filter-out $I/program,$(PYPATH))" \
+ 		TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*)))" \
+ 		PYTHONDONTWRITEBYTECODE=0 \
+ 		$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
+ 			SAL_USE_VCLPLUGIN=svp \
+ 		)) \
+ 		$(gb_UITest_COMMAND) \
+-		--soffice=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice \
++		--soffice=$(OOO_TEST_SOFFICE) \
+ 		--userdir=$(call gb_Helper_make_url,$(dir $(call gb_UITest_get_target,$*))user) \
+ 		--dir=$(strip $(MODULES)) \
+ 		$(gb_UITest_GDBTRACE) \
+diff --git a/Makefile.in b/Makefile.in
+index 037cb5dce95b..f1b7c28e3c59 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13,7 +13,6 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uic
+ 
+ MAKECMDGOALS?=all
+ build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
+- $(if $(filter build-nocheck uicheck,$(MAKECMDGOALS)),build)\
+  $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
+  $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS))
+ 
diff --git a/tests/uicheck b/tests/uicheck
new file mode 100755
index 0000000..632ae16
--- /dev/null
+++ b/tests/uicheck
@@ -0,0 +1,46 @@
+#!/bin/sh
+# autopkgtest check: Run uicheck against an installed version of LibreOffice
+# (c) 2017 Software in the Public Interest, Inc.
+# Authors: Rene Engelhard <rene at debian.org>
+
+set -e
+
+SRCDIR=`pwd`
+WORKDIR=`mktemp -d`
+
+
+echo "====== Patching the tree to build uicheck against an existing installation ======"
+patch -p1 < ./debian/tests/patches/uicheck-standalone.diff
+
+OOO_TEST_SOFFICE="${1:-path:/usr/lib/libreoffice/program/soffice}"
+
+#echo
+#echo "====== Generating configuration ======="
+#rm -f config_host.mk
+#./debian/rules config_host.mk 2>&1
+#sed -i 's/export ENABLE_CPPUNIT=.*/export ENABLE_CPPUNIT=TRUE/' config_host.mk
+#sed -i 's/export SYSTEM_CPPUNIT=.*/export SYSTEM_CPPUNIT=TRUE/' config_host.mk
+#
+#echo
+#echo "====== Build "test" library required ======"
+#gb_SUPPRESS_TESTS=true make test.all verbose=t
+
+echo
+echo "====== Enabling core dumps ======"
+# yes, we want core dumps and stack traces
+ulimit -c unlimited
+
+echo
+echo "====== Generating en_US.UTF-8 locale ======"
+cd $WORKDIR
+$SRCDIR/debian/scripts/locale-gen
+
+echo
+echo "====== Starting uicheck with ${CHECK_PARALLELISM} job against ${OOO_TEST_SOFFICE} ======"
+
+cd $SRCDIR
+export LOCPATH=$WORKDIR/debian/locales
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+make -rk \
+    uicheck verbose=t 2>&1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git



More information about the Pkg-openoffice-commits mailing list