[libreoffice] 03/05: generate configuration in uitest after all; otherwise it somehow always wants to re-autogen itself....

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 a28cd537f728d1e12d58fc51a91782301bae8c6f
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jun 20 06:36:42 2017 +0200

    generate configuration in uitest after all; otherwise it somehow always wants to re-autogen itself....
---
 tests/uicheck | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tests/uicheck b/tests/uicheck
index aa4162b..edcc17c 100755
--- a/tests/uicheck
+++ b/tests/uicheck
@@ -15,13 +15,15 @@ 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
-#
+# this normally shouldn't be needed but otherwise it wants a automatic
+# re-autogen.
+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

-- 
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