strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor make check to run subsequentcheck parallel to instset

Browse source 
... which saves 4 minutes on a "make check" here, when configured
--with-package-format="archive"

Change-Id: I415e0e95ae7f4e289fa4797643f5d744015d80ad
This commit is contained in:
Michael Stahl 2013-10-03 18:49:25 +02:00
parent 457e0aef52
commit bbadfca2ca
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.in
View file

@ -229,8 +229,11 @@ bootstrap: compilerplugins
#
# Build
#
# Note: if invoked as "make check" this will also run subsequentcheck!
#
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild \
all $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)
ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),)
install-gdb-printers -a $(INSTDIR)
endif
@ -373,7 +376,8 @@ findunusedcode:
| grep -v ^WSObject \
> unusedcode.easy
check: build subsequentcheck
# the actual running of subsequentcheck is now done in "build" target => faster
check: build
dump-deps:
@$(SRCDIR)/bin/module-deps.pl $(GNUMAKE) $(SRCDIR)/Makefile.gbuild

4
solenv/gbuild/Module.mk
View file

@ -229,10 +229,14 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
endef
# has order dependency on AllModulesButInstsetNative to be able to run
# subsequentcheck in the same make process on "make check"
define gb_Module_add_subsequentcheck_target
$(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
$$(gb_Module_CURRENTTARGET) :| \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
endef