[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - Makefile.in

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Sat Mar 21 11:55:59 UTC 2020


 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 084c5c5ed02278389840a85c2392cceb1ff5ef32
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Thu Mar 19 20:01:44 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Mar 21 12:55:29 2020 +0100

    make: map slowcheck to gbuild's build and slowcheck
    
    This is meant to to fix the Jenkins Windows/macOS buildbots after they
    started to run 'make unitcheck slowcheck'.
    
    (cherry picked from commit 4054a30e2b2fa254dfb20718ce757ceb2f638fd5)
    
    Change-Id: I128448ca3a190969c0cc0f02d2c27bc0a373129b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90793
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 6a3ceff3be9ee42199fdcbd434f5964ae55d13e5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90814
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 5423596012e0..5f6b979fa96c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uic
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
- $(if $(filter build-nocheck uicheck,$(MAKECMDGOALS)),build)\
+ $(if $(filter build-nocheck slowcheck uicheck,$(MAKECMDGOALS)),build)\
  $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\
  $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS))
 


More information about the Libreoffice-commits mailing list