[libreoffice] 01/01: disable gbuildtojson and its tests

[Rene Engelhard]

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

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

commit 6232566a8a5393b63f61aa38f922f5a20658dee3
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Dec 9 00:27:33 2017 +0100

    disable gbuildtojson and its tests
---
 changelog                         |  5 ++-
 patches/disable-gbuildtojson.diff | 66 +++++++++++++++++++++++++++++++++++++++
 patches/series                    |  1 +
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 57686c8..4a6f40e 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,9 @@ libreoffice (1:6.0.0~beta2-1) experimental; urgency=medium
   * debian/patches/apparmor-complain.diff: set complain mode for oosplash
     and soffice.bin profiles
   * debian/patches/sal-fix-kfreebsd-build.diff: add from gerrit
+  * debian/patches/disable-gbuildtojson.diff: disable gbuildtojson and its
+    tests. We don't need it and it fails now related to the gpg-agent files
+    created by xmlsecurity_signing cppunit test which uses gpg...
 
   * debian/control.in: remove openjdk conflicts ...
   * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
@@ -29,7 +32,7 @@ libreoffice (1:6.0.0~beta2-1) experimental; urgency=medium
   * debian/README.Debian: document how to debug and customize the included
     AppArmor profiles
 
- -- Rene Engelhard <rene at debian.org>  Fri, 08 Dec 2017 00:44:28 +0100
+ -- Rene Engelhard <rene at debian.org>  Sat, 09 Dec 2017 00:22:29 +0100
 
 libreoffice (1:6.0.0~beta1-2) experimental; urgency=medium
 
diff --git a/patches/disable-gbuildtojson.diff b/patches/disable-gbuildtojson.diff
new file mode 100644
index 0000000..68033d8
--- /dev/null
+++ b/patches/disable-gbuildtojson.diff
@@ -0,0 +1,66 @@
+This fails like
+
+======================================================================
+ERROR: test_gbuildtojson (gbuildtojson.CheckGbuildToJsonModules)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/data/rene/git/LibreOffice/libreoffice-6-0/solenv/qa/python/gbuildtojson.py", line 135, in test_gbuildtojson
+    shutil.copytree(os.path.join(os.environ['SRCDIR'], module), os.path.join(self.tempsrc, module))
+  File "/usr/lib/python3.6/shutil.py", line 359, in copytree
+    raise Error(errors)
+shutil.Error: [('/data/rene/git/LibreOffice/libreoffice-6-0/xmlsecurity/qa/unit/signing/data/S.gpg-agent.browser', '/tmp/gbuildm7c1xu2_/xmlsecurity/qa/unit/signing/data/S.gpg-agent.browser', "[Errno 6] No such device or address: '/data/rene/git/LibreOffice/libreoffice-6-0/xmlsecurity/qa/unit/signing/data/S.gpg-agent.browser'"), ('/data/rene/git/LibreOffice/libreoffice-6-0/xmlsecurity/qa/unit/signing/data/S.gpg-agent.extra', '/tmp/gbuildm7c1xu2_/xmlsecurity/qa/unit/signing/data/S.gpg-agen [...]
+
+----------------------------------------------------------------------
+Ran 2 tests in 120.312s
+
+FAILED (errors=1)
+
+Error: a unit test failed, please do one of:
+
+make PythonTest_solenv_python CPPUNITTRACE="gdb --args"
+    # for interactive debugging on Linux
+make PythonTest_solenv_python VALGRIND=memcheck
+    # for memory checking
+make PythonTest_solenv_python DEBUGCPPUNIT=TRUE
+    # for exception catching
+
+You can limit the execution to just one particular test by:
+
+make CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params...
+
+/data/rene/git/LibreOffice/libreoffice-6-0/solenv/gbuild/PythonTest.mk:38: recipe for target '/data/rene/git/LibreOffice/libreoffice-6-0/workdir/PythonTest/solenv_python/done' failed
+
+We don't really need to test gbuild here, so just disable it..
+
+diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
+index 70eb5f9fb7c3..435f5c1d2549 100644
+--- a/solenv/Module_solenv.mk
++++ b/solenv/Module_solenv.mk
+@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,solenv))
+ 
+ $(eval $(call gb_Module_add_targets_for_build,solenv,\
+ 	Executable_concat-deps \
+-	Executable_gbuildtojson \
+ ))
+ 
+ ifeq ($(COM),MSC)
+@@ -22,19 +21,6 @@ $(eval $(call gb_Module_add_targets,solenv,\
+ ))
+ endif
+ 
+-ifneq ($(DISABLE_PYTHON),TRUE)
+-ifneq ($(MAKE_VERSION),3.81) # gbuildtojson requires 3.82+
+-ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
+-ifneq ($(OS),MACOSX) # disable on macOS too, fails at least for me and would be pointless anyway surely
+-$(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
+-	CustomTarget_gbuildtesttools \
+-	PythonTest_solenv_python \
+-))
+-endif
+-endif
+-endif
+-endif
+-
+ ifneq ($(COMPILER_PLUGINS),)
+ ifeq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),)
+ $(eval $(call gb_Module_add_check_targets,solenv, \
diff --git a/patches/series b/patches/series
index 1f52720..fd0adab 100644
--- a/patches/series
+++ b/patches/series
@@ -30,6 +30,7 @@ no-openssl.diff
 disable-some-sc-tests-with-internal-cppunit.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
+disable-gbuildtojson.diff
 disable-tests-somehow-needing-more-fonts.diff
 tdf108963-test.diff
 apparmor-complain.diff

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