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

[libreoffice] 01/01: speed up check target: run make check in parallel in first attempt



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 33f174f4874f712e2e5cea7266f2c58cc48a0407
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Apr 2 01:40:02 2016 +0200

    speed up check target: run make check in parallel in first attempt
---
 changelog | 7 +++++--
 rules     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index e8ecbcd..e371c4e 100644
--- a/changelog
+++ b/changelog
@@ -21,8 +21,11 @@ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
     anymore since long
   * debian/libreoffice-mysql-connector.bug-script.in: fix PLATFORMID
     substitution to actually work
-  * debian/rules: move liblosessioninstallerlo.so into -gnome when enabled;
-    better suited there
+  * debian/rules:
+    - move liblosessioninstallerlo.so into -gnome when enabled; better suited
+      there
+    - speed up check target: run $(MAKE) check in parallel and only if failing
+      the second run without parallelism
 
  -- Rene Engelhard <rene@debian.org>  Tue, 29 Mar 2016 19:32:03 +0200
 
diff --git a/rules b/rules
index 8ee5996..b379c7c 100755
--- a/rules
+++ b/rules
@@ -2029,7 +2029,7 @@ endif
 		export SAL_USE_VCLPLUGIN="svp"; \
 		unset DISPLAY; \
 		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
-		PARALLELISM=1 $(MAKE) -k $(CHECKTARGET) || PARALLELISM=1 $(MAKE) $(CHECKTARGET) && \
+		$(MAKE) -k $(CHECKTARGET) || PARALLELISM=1 $(MAKE) $(CHECKTARGET) && \
 	rm -rf $$t
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: