diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-05 17:03:04 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-06 12:39:28 +0100 |
| commit | 96409470b19d32a2310086b089542b333686f4da (patch) | |
| tree | a9f5dd9446101c1f8f1c92d56a164ec4fea0d78b /solenv | |
| parent | 076eaea23c1c9992499399504c90fd00d83f1539 (diff) | |
reintroduce gb_PARTIAL_BUILD to know if we want to run slowcheck
Also kills horrible SKIP_TESTS hack along the way.
Change-Id: Ida59fb44d247b52ef11ee7ba5e4e006996a87ebf
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Module.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/partial_build.mk | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 0e694e5f6173..80e90bbf8400 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -92,7 +92,7 @@ $(call gb_Module_get_target,%) : .PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations .DEFAULT_GOAL := all -all : build unitcheck +all : build unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck) build : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) @@ -197,7 +197,6 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -ifeq ($(strip $(SKIP_TESTS)),) define gb_Module_add_check_target $(call gb_Module__read_targetfile,$(1),$(2),check target) @@ -213,7 +212,6 @@ $(call gb_Module_get_slowcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef -endif # SKIP_TESTS define gb_Module_add_subsequentcheck_target $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target) diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index aa7def4c9a58..9c7f3fb3b750 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -5,6 +5,7 @@ ifeq ($(SOLARENV),) include $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../../config_$(gb_Side).mk endif +gb_PARTIAL_BUILD := T include $(SOLARENV)/gbuild/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(shell ls $(module_directory)/Module*.mk))) +$(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)/Module*.mk))) |