[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 02/03: run the sdk-examples tests in /tmp, not $HOME, remove obsolete make cleans and make Java test actually be run



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

rene pushed a commit to branch master
in repository libreoffice.

commit b2ef3827d098c09ff5f77b1edd52e624f25271b5
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Apr 7 11:07:46 2016 +0200

    run the sdk-examples tests in /tmp, not $HOME, remove obsolete make cleans and make Java test actually be run
---
 tests/sdk-examples | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/sdk-examples b/tests/sdk-examples
index c249897..d522caf 100755
--- a/tests/sdk-examples
+++ b/tests/sdk-examples
@@ -4,16 +4,20 @@ echo "====== Preparing the SDK environment ======"
 cd /usr/lib/libreoffice/sdk
 . ./setsdkenv_unix.sh
 
-d=`pwd`
+SRCDIR=`pwd`
+
+# 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"`
 
 echo "====== Building C++ example DocumentLoader ====== "
-cd $d/examples/cpp/DocumentLoader
-make clean
+cd $SRCDIR/examples/cpp/DocumentLoader
 make
 
 echo "====== Building C++ example counter ====== "
-cd $d/examples/cpp/counter
-make clean
+cd $SRCDIR/examples/cpp/counter
 make
 echo "====== Running countermain.run ======"
 make countermain.run
@@ -21,7 +25,7 @@ make countermain.run
 # This needs unowinreg.dll which is in -dev, but only for i386/amd64...
 if [ -e /usr/lib/libreoffice/sdk/classes/win/unowinreg.dll ]; then
 	echo "====== Building Java DocumentHandling example ======"
-	cd $d/examples/java/DocumentHandling
-	make clean
+	cd $SRCDIR/examples/java/DocumentHandling
+	make
 fi
 

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


Reply to: