------------------------------------------------------------
revno: 2030
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2010-06-16 22:12:23 +0200
message:
smoketest fixes
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-06-15 10:02:38 +0000
+++ b/changelog 2010-06-16 20:12:23 +0000
@@ -1,3 +1,12 @@
+openoffice.org (1:3.2.1-3) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - make smoketest install into debian/smoketest/tmp as some buildds
+ only have a 128m /tmp...
+ - don't run smoketest on gcj archs when on the buildds
+
+ -- Rene Engelhard <r...@debian.org> Wed, 16 Jun 2010 10:04:26 +0200
+
openoffice.org (1:3.2.1-2) unstable; urgency=low
* debian/patches/powerpc-fixes.diff: add powerpc fix and powerpcspe
=== modified file 'rules'
--- a/rules 2010-06-14 19:01:01 +0000
+++ b/rules 2010-06-16 20:12:23 +0000
@@ -204,7 +204,13 @@
USE_SYSTEM_REDLAND=y
USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
-RUN_SMOKETEST=y
+ifeq "$(JDK)" "openjdk"
+ RUN_SMOKETEST=y
+else
+ ifneq (buildd,$(shell whoami))
+ RUN_SMOKETEST=n
+ endif
+endif
RUN_API_TESTS=n
RUN_UNIT_TESTS=n
USE_LIBCURL4=y
@@ -829,11 +835,7 @@
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
- ifeq "$(ARCH)" "armel"
- TEST_JAVA_HOME=/usr/lib/jvm/java-gcj
- else
TEST_JAVA_HOME=$(JAVA_HOME)
- endif
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
ifeq "$(LENNY_BACKPORT)" "y"
@@ -2059,9 +2061,11 @@
cd $(SOURCE_TREE)/smoketestoo_native && \
. $(CURDIR)/$(SOURCE_TREE)/*.sh; \
export PATH=$(BUILD_PATH); \
- export TMPDIR=`mktemp -q -d`; \
+ export TMPDIR=$(CURDIR)/debian/smoketest; \
export JAVA_HOME=$(TEST_JAVA_HOME); \
SAL_USE_VCLPLUGIN="svp" ../solenv/bin/build.pl
+ # doesn't get cleaned up...
+ rmdir $(CURDIR)/debian/smoketest/ooopackaging
ifeq "$(ARCH)" "armel"
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 -R <
$(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
