[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. 02f9a6a277758f22a2b694d55f8f06008c99783f



The following commit has been merged in the master branch:
commit cc5f8aa9a14e4fb689387dd66cc752f6c8ebe944
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Apr 30 11:36:18 2011 +0000

    disable smoketest on sparc, flaky

diff --git a/changelog b/changelog
index 2baa0db..62e58c2 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.3.2-4) UNRELEASED; urgency=low
+
+  * disable smoketest on sparc, flaky 
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 29 Apr 2011 21:12:05 +0200
+
 libreoffice (1:3.3.2-3) unstable; urgency=low
 
   * debian/rules, debian/control.in:
diff --git a/rules b/rules
index 5d153ba..8933567 100755
--- a/rules
+++ b/rules
@@ -202,7 +202,11 @@ USE_OOO_BUILD_DESKTOPS=n
 PACKAGE_SDK=y
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(JDK)" "openjdk"
-    RUN_SMOKETEST=y
+    ifneq "$(ARCH)" "sparc"
+      RUN_SMOKETEST=y
+    else
+      RUN_SMOKETEST=n
+    endif
     ifneq (,$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
       RUN_SUBSEQUENT_TESTS=y
     else

-- 
LibreOffice packaging repository


Reply to: