The following commit has been merged in the debian-experimental-3.5 branch:
commit 3cd5d0ac78bef1e549378840bcecbc08d8eed9ce
Author: Rene Engelhard <[email protected]>
Date: Tue Feb 21 21:01:55 2012 +0100
cleanup smoketest HOME/TMPDIR; get did of debian/smoketest and use a
mktemp'ed dir
diff --git a/rules b/rules
index d2725a9..d892b89 100755
--- a/rules
+++ b/rules
@@ -1602,17 +1602,14 @@ ifneq (,$(findstring
$(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
patch -p1 <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
+ t=`mktemp -q -d`; \
cd $(SOURCE_TREE) && \
export PATH=$(BUILD_PATH); \
- export TMPDIR=$(CURDIR)/debian/smoketest; \
- export HOME=$(CURDIR)/debian/smoketest; \
+ export TMPDIR=$$t; \
+ export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
- $(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T
- # doesn't get cleaned up.. (at least the dirs, the contents are gone)
- if test -d $(CURDIR)/debian/smoketest; then \
- cd $(CURDIR)/debian/smoketest && \
- find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \; ; \
- fi
+ $(MAKE) check gb_FULLDEPS= gb_Deliver_HARDLINK=T; \
+ rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
cd $(SOURCE_TREE)/smoketest && \
--
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]
