./packages/libreoffice/3.3.0/experimental r2181: also disable the 'subsequent tests' on non-openjdk builds; reenable them on i386
------------------------------------------------------------
revno: 2181
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-11-10 11:33:31 +0100
message:
also disable the 'subsequent tests' on non-openjdk builds; reenable them on i386
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-11-10 10:32:10 +0000
+++ b/changelog 2010-11-10 10:33:31 +0000
@@ -28,6 +28,8 @@
apparently it is not needed anymore (and doing so breaks BrOffice.org
About) (closes: #602868)
- we need to explicitely add --enable-build-unowinreg now
+ - also disable the "subsequent tests" on non-openjdk builds; reenable them
+ on i386
* debian/broffice.org.p*.in: adapt diversions for new intro.png;
remove ooo*.res/versionrc diversions
* debian/soffice-template.desktop.in: update for LibreOffice and ..
=== modified file 'rules'
--- a/rules 2010-11-04 08:40:29 +0000
+++ b/rules 2010-11-10 10:33:31 +0000
@@ -229,18 +229,16 @@
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
RUN_SMOKETEST=y
+ RUN_SUBSEQUENT_TESTS=y
else
ifneq (buildd,$(shell whoami))
RUN_SMOKETEST=n
+ RUN_SUBSEQUENT_TESTS=n
endif
endif
else
RUN_SMOKETEST=n
-endif
-ifeq "$(ARCH)" "i386"
-RUN_SUBSEQUENT_TESTS=n
-else
-RUN_SUBSEQUENT_TESTS=y
+ RUN_SUBSQUENT_TESTS=n
endif
# "Unfortunately, running the unoapi tests is still not stable enough to give
# useful results. Therefore, running subsequenttests has been disabled in the
Reply to: