[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta1-2-287-g58523f8
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit b1775079502cf9a1d0a5695898145d909fa4b74d
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sun Jun 9 12:26:27 2013 +0200
disable all sw test for beta
diff --git a/changelog b/changelog
index 6b5103c..b9f83be 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,7 @@ libreoffice (1:4.1.0~beta2-0ubuntu1~ppa1) saucy; urgency=low
* new upstream beta
* unfuzz Ubuntu palette patch
* remove sessioninstaller for wizards patch -- they are all python now
+ * disable all sw tests for this beta
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 07 Jun 2013 23:38:18 +0200
diff --git a/patches/disable-sw-tests.diff b/patches/disable-sw-tests.diff
new file mode 100644
index 0000000..de7e6f7
--- /dev/null
+++ b/patches/disable-sw-tests.diff
@@ -0,0 +1,40 @@
+From ca847d43de4c706f906f6473b05f4cf53c39feb7 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 9 Jun 2013 13:15:29 +0200
+Subject: [PATCH] disable sw tests for beta
+
+---
+ sw/Module_sw.mk | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
+index 202c67c..90d9416 100644
+--- a/sw/Module_sw.mk
++++ b/sw/Module_sw.mk
+@@ -53,7 +53,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
+ CppunitTest_sw_ww8export \
+ CppunitTest_sw_ww8import \
+ CppunitTest_sw_rtfexport \
+- CppunitTest_sw_rtfimport \
+ CppunitTest_sw_odfexport \
+ CppunitTest_sw_odfimport \
+ ))
+@@ -66,15 +65,12 @@ endif
+
+ ifneq ($(OOO_JUNIT_JAR),)
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
+- JunitTest_sw_complex \
+- JunitTest_sw_unoapi \
+ ))
+ endif
+
+ ifneq ($(DISABLE_PYTHON),TRUE)
+ ifneq ($(OS),WNT)
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
+- PythonTest_sw_python \
+ ))
+ endif
+ endif
+--
+1.8.3
+
diff --git a/patches/disable-sw_python.diff b/patches/disable-sw_python.diff
deleted file mode 100644
index a58ff67..0000000
--- a/patches/disable-sw_python.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
-index 202c67c..a9b7e0b 100644
---- a/sw/Module_sw.mk
-+++ b/sw/Module_sw.mk
-@@ -73,9 +73,9 @@ endif
-
- ifneq ($(DISABLE_PYTHON),TRUE)
- ifneq ($(OS),WNT)
--$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
-- PythonTest_sw_python \
--))
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
-+# PythonTest_sw_python \
-+#))
- endif
- endif
-
diff --git a/patches/series b/patches/series
index 62e2777..3cd7851 100644
--- a/patches/series
+++ b/patches/series
@@ -25,7 +25,7 @@ disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
-disable-sw_python.diff
+disable-sw-tests.diff
#uno-executables-link-to-xmlreader.diff
javadoc-optional.diff
show-the-startcenter.diff
--
LibreOffice packaging repository
Reply to: