[PATCH] replace SKIP_TESTS with a generic selection of target group

[Björn Michaelsen (via_Code_Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2742

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2742/1

replace SKIP_TESTS with a generic selection of target group

- this allows e.g. tinderboxes, which know that they just completed a
  build, to only read the files for the tests
- since the dep file can be quite large this might help performance in
  such scenarios quite a bit

Change-Id: I1265dbacdd9f3731fe755a1b997c2fa5ac1f7421
---
M Makefile.in
M solenv/gbuild/Module.mk
2 files changed, 11 insertions(+), 4 deletions(-)



diff --git a/Makefile.in b/Makefile.in
index 0eedd22..3814478 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -288,7 +288,7 @@
 	cd ios && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 endif
 
-build-nocheck : export SKIP_TESTS := YES
+build-nocheck : export gb_Module_SKIPTARGETS := check slowcheck subsequentcheck
 build-nocheck : build
 
 # Ideally solenv would be also in Module_cross_toolset.mk
@@ -398,7 +398,7 @@
 	@echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice"
 endif
 
-dev-install-nocheck : export SKIP_TESTS := YES
+dev-install-nocheck : export SKIP_TESTS := check slowcheck subsequentcheck
 dev-install-nocheck : dev-install
 
 dev-update:
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index d20176a..66bdbb6 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -187,6 +187,7 @@
 
 endef
 
+ifeq (,$(filter build,$(gb_Module_SKIPTARGETS))
 define gb_Module_add_target
 $(call gb_Module__read_targetfile,$(1),$(2),target)
 
@@ -194,8 +195,9 @@
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
+endif
 
-ifeq ($(strip $(SKIP_TESTS)),)
+ifeq (,$(filter check,$(gb_Module_SKIPTARGETS))
 define gb_Module_add_check_target
 $(call gb_Module__read_targetfile,$(1),$(2),check target)
 
@@ -203,7 +205,9 @@
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
+endif
 
+ifeq (,$(filter slowcheck,$(gb_Module_SKIPTARGETS))
 define gb_Module_add_slowcheck_target
 $(call gb_Module__read_targetfile,$(1),$(2),slowcheck target)
 
@@ -211,8 +215,10 @@
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
-endif # SKIP_TESTS
+endif
+endif
 
+ifeq (,$(filter subsequentcheck,$(gb_Module_SKIPTARGETS))
 define gb_Module_add_subsequentcheck_target
 $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
 
@@ -220,6 +226,7 @@
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
+endif
 
 define gb_Module_add_moduledir
 include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk

-- 
To view, visit https://gerrit.libreoffice.org/2742
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1265dbacdd9f3731fe755a1b997c2fa5ac1f7421
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen <bjoern.michaelsen at canonical.com>