[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-50-g12883a8
The following commit has been merged in the debian-experimental-3.5 branch:
commit e542b8d9fb67440d879b028d0921c8b74119b128
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 21 08:46:42 2011 +0000
improve check running, only install for smoketest for en-US
diff --git a/changelog b/changelog
index c180860..49ec1d7 100644
--- a/changelog
+++ b/changelog
@@ -16,7 +16,8 @@ libreoffice (1:3.5.0~alpha0~git20111021-1) UNRELEASED; urgency=low
- add new conditionals and build-deps for new libvisio,librsvg,gettext,
libcmis usage and libexttextcat switch - and those we needed to move
from libreoffice-builds' distro-configs
- - run new "make check" instead of solenv/bin/subsequenttests
+ - run new "make check" instead of solenv/bin/subsequenttests and
+ manual smoketest
* debian/rules, debian/control.in:
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
diff --git a/patches/check-only-en-US.diff b/patches/check-only-en-US.diff
new file mode 100644
index 0000000..c20f3c9
--- /dev/null
+++ b/patches/check-only-en-US.diff
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 197eb8e..ae0f09b 100644
+--- libreoffice-3.5.0/Makefile.in
++++ libreoffice-3.5.0/Makefile.in
+@@ -57,7 +57,7 @@ check : allcheck
+ @true
+
+ %check:
+- @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk -r \
++ @. ./Env.Host.sh && export WITH_LANG=en-US && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk -r \
+ $(if @VERBOSE@,,-s) --jobs="$(if \
+ $(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
+ $(patsubst allcheck,check,$@)
diff --git a/patches/series b/patches/series
index 6a7330a..f5c5e3e 100644
--- a/patches/series
+++ b/patches/series
@@ -12,3 +12,4 @@ libebook-1.2.so.11.diff
#add-sdbc-postgresql.diff
fix-system-lpsolve-build.diff
install-no-dependency-on-build.diff
+check-only-en-US.diff
diff --git a/rules b/rules
index eaaef3b..99106c5 100755
--- a/rules
+++ b/rules
@@ -195,16 +195,9 @@ SYSTEM_STUFF += redland
PACKAGE_SDK=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
- RUN_SMOKETEST=n
- RUN_MAKE_CHECK=n
- else
- ifneq ($(ON_BUILDD),y)
- RUN_SMOKETEST=n
- RUN_MAKE_CHECK=n
- endif
+ RUN_MAKE_CHECK=y
endif
else
- RUN_SMOKETEST=n
RUN_MAKE_CHECK=n
endif
# "Unfortunately, running the unoapi tests is still not stable enough to give
@@ -647,7 +640,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
endif
-ifeq "$(RUN_SMOKETEST)" "y"
+ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , epm
endif
ifeq "$(RUN_TESTTOOL)" "y"
@@ -1644,65 +1637,43 @@ endif
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb" NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
-ifeq "$(PACKAGE_SDK)" "y"
- # build gengal...
- cd $(SOURCE_TREE)/svx/source/gengal; \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
- PATH=$(BUILD_PATH) \
- dmake
-endif
+#ifeq "$(PACKAGE_SDK)" "y"
+# # build gengal...
+# cd $(SOURCE_TREE)/svx/source/gengal; \
+# . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+# PATH=$(BUILD_PATH) \
+# dmake
+#endif
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- $(CURDIR)/debian/rules test
+ $(CURDIR)/debian/rules check
endif
touch $@
-test:
- # some test library needed for the tests...
- if [ ! -f $(SOURCE_TREE)/test/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/libtest.so ]; then \
- cd $(SOURCE_TREE)/test && \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
- export PATH=$(BUILD_PATH); \
- ../solenv/bin/build.pl; \
- ../solenv/bin/deliver.pl; \
- fi
-ifeq "$(RUN_SMOKETEST)" "y"
- # sigh. the new smoketest needs a archive/install/en-US/OOo_*_install_*.tar.gz
- # build it.
- if [ ! -d $(SOURCE_TREE)/instsetoo_native/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/OpenOffice/archive/install/en-US ]; then \
- cd $(SOURCE_TREE)/instsetoo_native/util && \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
- export PATH=$(BUILD_PATH); \
- EPM=yes PKGFORMAT=archive WITH_LANG="en-US" dmake openoffice; \
- fi
- # smoketest
+check:
+ifeq "$(RUN_MAKE_CHECK)" "y"
ifeq "$(DEB_HOST_ARCH)" "armel"
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
- cd $(SOURCE_TREE)/smoketestoo_native && \
+
+ cd $(SOURCE_TREE) && \
. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
export PATH=$(BUILD_PATH); \
export TMPDIR=$(CURDIR)/debian/smoketest; \
- export JAVA_HOME=$(TEST_JAVA_HOME); \
- export SAL_USE_VCLPLUGIN="svp"; \
export HOME=$(CURDIR)/debian/smoketest; \
- ../solenv/bin/build.pl
+ export SAL_USE_VCLPLUGIN="svp"; \
+ $(MAKE) check
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
cd $(CURDIR)/debian/smoketest && \
find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \;
+
ifeq "$(DEB_HOST_ARCH)" "armel"
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
endif
-ifeq "$(RUN_MAKE_CHECK)" "y"
- cd $(SOURCE_TREE) && \
- export PATH=$(BUILD_PATH); \
- . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
- $(MAKE) check
-endif
install: $(STAMP_DIR)/install
$(STAMP_DIR)/install: $(STAMP_DIR)/build
--
LibreOffice packaging repository
Reply to: