------------------------------------------------------------
revno: 1990
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2010-05-19 22:14:44 +0200
message:
- start a next try to run the smoketest after the build. move the tests in
the non-fakeroot part of the build (call test in build)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-05-19 20:14:16 +0000
+++ b/changelog 2010-05-19 20:14:44 +0000
@@ -13,8 +13,11 @@
* debian/rules,
debian/openoffice.org-{filter-binfilter,evolution,kab}.bug-script.in:
fix component bug scripts and add the kab one
+ * debian/rules:
+ - start a next try to run the smoketest after the build. move the tests in
+ the non-fakeroot part of the build (call test in build)
- -- Rene Engelhard <[email protected]> Fri, 14 May 2010 16:39:37 +0200
+ -- Rene Engelhard <[email protected]> Wed, 19 May 2010 19:54:36 +0000
openoffice.org (1:3.2.1~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-05-18 15:23:29 +0000
+++ b/rules 2010-05-19 20:14:44 +0000
@@ -204,7 +204,7 @@
USE_SYSTEM_REDLAND=y
USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
-RUN_SMOKETEST=n
+RUN_SMOKETEST=y
RUN_API_TESTS=n
RUN_UNIT_TESTS=n
USE_LIBCURL4=y
@@ -740,9 +740,6 @@
CONFIGURE_FLAGS += --disable-qadevooo
-ifeq "$(RUN_SMOKETEST)" "y"
- BUILD_DEPS += , xvfb, xbase-clients, xfonts-base
-endif
ifeq "$(RUN_API_TESTS)" "y"
BUILD_DEPS += , tcsh
endif
@@ -2012,11 +2009,13 @@
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb"
NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
- touch $@
-
-test: $(STAMP_DIR)/test
-$(STAMP_DIR)/test: $(STAMP_DIR)/build
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+ $(CURDIR)/debian/rules test
+endif
+
+ touch $@
+
+test:
ifeq "$(RUN_UNIT_TESTS)" "y"
# build/run unit tests
-cd $(SOURCE_TREE)/instsetoo_native; \
@@ -2029,11 +2028,8 @@
cd $(SOURCE_TREE)/smoketestoo_native && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
- if [ -n "$$DISPLAY" ]; then \
- ../solenv/bin/build.pl; \
- else \
- xvfb-run -a ../solenv/bin/build.pl; \
- fi
+ export TMPDIR=`mktemp -q -d`; \
+ SAL_USE_VCLPLUGIN="svp" ../solenv/bin/build.pl
endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(RUN_API_TESTS)" "y"
@@ -2044,12 +2040,9 @@
solenv/bin/cwscheckapi -o -a
endif
endif
-endif
-
- touch $@
install: $(STAMP_DIR)/install
-$(STAMP_DIR)/install: $(STAMP_DIR)/build $(STAMP_DIR)/test
+$(STAMP_DIR)/install: $(STAMP_DIR)/build
dh_testdir
dh_testroot
