The following commit has been merged in the master branch:
commit 4f1df757c60ca4aedd23d96c0d1622a6503aab62
Author: Rene Engelhard <[email protected]>
Date: Fri Feb 24 00:01:36 2012 +0100
cleanup smoketest HOME/TMPDIR; get did of debian/smoketest and use a
mktemp'ed dir
diff --git a/rules b/rules
index d7ea336..a21e107 100755
--- a/rules
+++ b/rules
@@ -1857,17 +1857,16 @@ ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
+ t=`mktemp -q -d`; \
cd $(SOURCE_TREE)/smoketestoo_native && \
. $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
export PATH=$(BUILD_PATH); \
- export TMPDIR=$(CURDIR)/debian/smoketest; \
+ export TMPDIR=$$t; \
export JAVA_HOME=$(TEST_JAVA_HOME); \
export SAL_USE_VCLPLUGIN="svp"; \
- export HOME=$(CURDIR)/debian/smoketest; \
- ../solenv/bin/build.pl
- # doesn't get cleaned up.. (at least the dirs, the contents are gone)
- cd $(CURDIR)/debian/smoketest && \
- find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \;
+ export HOME=$$t; \
+ ../solenv/bin/build.pl; \
+ rm -rf $$t
ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 -R <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
