[libreoffice] 01/05: use upstreams odk/build-examples check directly

[Rene Engelhard]

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 79d2ed9a9b0a6f87da9aa41b765c8acf541c7321
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jul 3 22:40:07 2017 +0200

    use upstreams odk/build-examples check directly
---
 changelog                |  7 +++--
 tests/control            |  4 +--
 tests/odk-build-examples | 27 ++++++++++++++++
 tests/sdk-examples       | 82 ------------------------------------------------
 4 files changed, 33 insertions(+), 87 deletions(-)

diff --git a/changelog b/changelog
index 74d58f0..4cd7e2b 100644
--- a/changelog
+++ b/changelog
@@ -5,10 +5,11 @@ libreoffice (1:5.4.0~rc2~git20170703-1) UNRELEASED; urgency=medium
   * debian/patches/fix-m68k-build-again.diff: as name says; remove
     somehow misapplied upstream patch and reapply 5.3s m68k-alignment.diff
 
-  * debian/tests/control, debian/tests/sdk-examples: resemble upstream
-    build-examples check. Build all examples mentioned there.
+  * debian/tests/control, debian/tests/sdk-examples: move ..
+  * debiaN/tests/odk-build-examples: ... here and use upstreams
+    odk/build-examples check directly.
     (Needs zip, python3-uno and libreoffice-officbean as new test Depends:)
-  * debian/tests/sdk-examples: actually set -e...
+  * debian/tests/odk-build-examples: actually set -e...
   * debian/rules, debian/tests/control: remove extra hackery to add our
     Build-Depends-(Indep-): to debian/tests/control.in; misses some packages
     (e.g. ant) and it should work at least since autopktest 3.16 from Jul 2015;
diff --git a/tests/control b/tests/control
index af6c87e..bde8af1 100644
--- a/tests/control
+++ b/tests/control
@@ -10,5 +10,5 @@ Depends: python3, python3-uno
 Tests: uicheck
 Depends: @builddeps@, libreoffice, python3-uno, locales
 
-Tests: sdk-examples
-Depends: libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, build-essential, default-jdk, python3-uno, libreoffice-officebean, zip
+Tests: odk-build-examples
+Depends: @builddeps@, libreoffice-dev, libreoffice-dev-doc, libreoffice-dev-common, libreoffice-java-common, python3-uno, libreoffice-officebean
diff --git a/tests/odk-build-examples b/tests/odk-build-examples
new file mode 100755
index 0000000..e6dabe1
--- /dev/null
+++ b/tests/odk-build-examples
@@ -0,0 +1,27 @@
+#!/bin/sh
+# autopkgtest check: Run the odk/build-examples check against an installed
+# version of the LibreOffice SDK
+# (c) 2017 Software in the Public Interest, Inc.
+# Authors: Rene Engelhard <rene at debian.org>
+
+set -e
+
+SRCDIR=`pwd`
+CHECK_PARALLELISM=1
+
+
+echo "====== Patching the tree to build the odk build-examples test against an existing installation ======"
+patch -p1 < ./debian/tests/patches/odk-build-examples-standalone.diff
+
+echo
+echo "====== Generating configuration ======="
+rm -f config_host.mk
+./debian/rules config_host.mk 2>&1
+
+echo
+echo "====== Starting build with ${CHECK_PARALLELISM} job against /usr/lib/libreoffice/sdk ======"
+
+cd $SRCDIR/odk
+export PARALLELISM=$CHECK_PARALLELISM
+make -rk \
+	make CustomTarget_odk/build-examples verbose=t 2>&1
diff --git a/tests/sdk-examples b/tests/sdk-examples
deleted file mode 100755
index 26af824..0000000
--- a/tests/sdk-examples
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-set -e
-
-SRCDIR=`pwd`
-
-# sync with odk/CustomTarget_build-examples
-my_example_dirs=" \
-    CLI/CSharp/Spreadsheet \
-    CLI/VB.NET/WriterDemo \
-    DevelopersGuide/BasicAndDialogs/ToolkitControls \
-    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp \
-    DevelopersGuide/Components/CppComponent \
-    DevelopersGuide/Database/DriverSkeleton \
-    DevelopersGuide/Extensions/DialogWithHelp \
-    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp \
-    DevelopersGuide/ProfUNO/CppBinding \
-    DevelopersGuide/ProfUNO/SimpleBootstrap_cpp \
-    OLE/activex \
-    cpp/DocumentLoader \
-    cpp/complextoolbarcontrols \
-    cpp/counter \
-    cpp/remoteclient \
-    python/toolpanel \
-    DevelopersGuide/BasicAndDialogs/CreatingDialogs \
-    DevelopersGuide/Charts \
-    DevelopersGuide/Components/Addons/JobsAddon \
-    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java \
-    DevelopersGuide/Components/JavaComponent \
-    DevelopersGuide/Components/SimpleLicense \
-    DevelopersGuide/Components/Thumbs \
-    DevelopersGuide/Components/dialogcomponent \
-    DevelopersGuide/Config \
-    DevelopersGuide/Database \
-    DevelopersGuide/Drawing \
-    DevelopersGuide/FirstSteps \
-    DevelopersGuide/Forms \
-    DevelopersGuide/GUI \
-    DevelopersGuide/OfficeBean \
-    DevelopersGuide/OfficeDev \
-    DevelopersGuide/OfficeDev/Clipboard \
-    DevelopersGuide/OfficeDev/DesktopEnvironment \
-    DevelopersGuide/OfficeDev/DisableCommands \
-    DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter \
-    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection \
-    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java \
-    DevelopersGuide/OfficeDev/Linguistic \
-    DevelopersGuide/OfficeDev/PathSettings \
-    DevelopersGuide/OfficeDev/PathSubstitution \
-    DevelopersGuide/OfficeDev/TerminationTest \
-    DevelopersGuide/ProfUNO/InterprocessConn \
-    DevelopersGuide/ProfUNO/Lifetime \
-    DevelopersGuide/ProfUNO/SimpleBootstrap_java \
-    DevelopersGuide/ScriptingFramework/SayHello \
-    DevelopersGuide/ScriptingFramework/ScriptSelector \
-    DevelopersGuide/Spreadsheet \
-    DevelopersGuide/Text \
-    DevelopersGuide/UCB \
-    java/DocumentHandling \
-    java/Drawing \
-    java/Inspector \
-    java/MinimalComponent \
-    java/PropertySet \
-    java/Spreadsheet \
-    java/Text \
-    java/ToDo"
-
-echo "====== Preparing the SDK environment ======"
-cd /usr/lib/libreoffice/sdk
-. ./setsdkenv_unix.sh
-
-# don't clobber $HOME but do it in /tmp
-_old_sdk_out=$OO_SDK_OUT
-WORKDIR=`mktemp -d`
-export OO_SDK_OUT=$WORKDIR
-export PATH=`echo $PATH | sed -e "s,$_old_sdk_out,$OO_SDK_OUT,g"`
-
-for i in $my_example_dirs; do 
-	echo "====== Building $i example ======"
-	cd /usr/lib/libreoffice/sdk/examples/$i
-	make
-done

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