sc/Module_sc.mk | 5 +-
solenv/gbuild/Module.mk | 43 +++++++++++++++---
solenv/gbuild/TargetLocations.mk | 1
solenv/gbuild/extensions/post_DisableIosUnitchecks.mk | 1
solenv/gbuild/extensions/post_SpeedUpTargets.mk | 1
solenv/gbuild/gbuild.help.txt | 1
6 files changed, 46 insertions(+), 6 deletions(-)
New commits:
commit 17f59f3aa995dd324ec88974b6196402f8fd89f0
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Feb 8 15:28:09 2012 +0100
stick to three-letter length
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index f99c4cb..c46a2e8 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -69,7 +69,7 @@ $(call gb_Module_get_check_target,%) :
touch $@)
$(call gb_Module_get_slowcheck_target,%) :
- $(call gb_Output_announce,$*,$(true),SCHK,5)
+ $(call gb_Output_announce,$*,$(true),SLC,5)
$(call gb_Output_announce_title,module $* slowchecks done.)
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
commit 7472fe259e2cc94ddf66de29ab1d287d0775ceb3
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Wed Feb 8 15:07:40 2012 +0100
remove superflous whitespace
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2825cce..ef47326 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_filters_test \
))
-$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+$(eval $(call gb_Module_add_slowcheck_targets,sc,\
CppunitTest_sc_ucalc \
))
commit 590c2400f168faa6eccf793b478d681dcdb73ca7
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Jan 13 20:51:34 2012 +0100
first try to add slowcheck build target
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 112fa40..2825cce 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -42,10 +42,13 @@ $(eval $(call gb_Module_add_targets,sc,\
endif
$(eval $(call gb_Module_add_check_targets,sc,\
- CppunitTest_sc_ucalc \
CppunitTest_sc_filters_test \
))
+$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+ CppunitTest_sc_ucalc \
+))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
JunitTest_sc_complex \
JunitTest_sc_unoapi \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 24cc1e5..f99c4cb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -34,10 +34,12 @@
# excluding tests recursive Modules
# Module/unitcheck run unit tests all unit tests
# recursive
Module/checks
+# Module/slowcheck run all slow unit tests
# Module/subsequentcheck run system tests all system tests
# recursive
Module/subsequentchecks
# build (global) build the product top-level Module
# unitcheck (global) run unit tests top-level
Module/unitcheck
+# slowcheck (global) run slow unit tests top-level
Module/slowcheck
# subsequentcheck (global) run system tests top-level
Module/subsequentcheck
# all (global) default goal build unitcheck
@@ -48,6 +50,7 @@ gb_Module_ALLMODULES :=
gb_Module_MODULELOCATIONS :=
gb_Module_TARGETSTACK :=
gb_Module_CHECKTARGETSTACK :=
+gb_Module_SLOWCHECKTARGETSTACK :=
gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
gb_Module_CLEANTARGETSTACK :=
@@ -56,7 +59,7 @@ $(call gb_Module_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),MOD,5)
$(call gb_Output_announce_title,module $* cleared.)
-$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_Module_get_target,$*) $(call
gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
+ rm -f $(call gb_Module_get_target,$*) $(call
gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call
gb_Module_get_subsequentcheck_target,$*))
$(call gb_Module_get_check_target,%) :
$(call gb_Output_announce,$*,$(true),CHK,5)
@@ -65,6 +68,13 @@ $(call gb_Module_get_check_target,%) :
mkdir -p $(dir $@) && \
touch $@)
+$(call gb_Module_get_slowcheck_target,%) :
+ $(call gb_Output_announce,$*,$(true),SCHK,5)
+ $(call gb_Output_announce_title,module $* slowchecks done.)
+ -$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && \
+ touch $@)
+
$(call gb_Module_get_subsequentcheck_target,%) :
$(call gb_Output_announce,$*,$(true),SCK,5)
$(call gb_Output_announce_title,module $* subsequentchecks done.)
@@ -79,7 +89,7 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : build all clean unitcheck subsequentcheck dev-install
+.PHONY : build all clean unitcheck slowcheck subsequentcheck dev-install
.DEFAULT_GOAL := all
ifeq ($(strip $(gb_PARTIALBUILD)),)
@@ -119,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
debugrun :| build
endif
-all : build unitcheck
+all : build unitcheck slowcheck
$(info $(gb_Module_BUILDHINT))
build :
@@ -134,6 +144,11 @@ unitcheck :
$(call gb_Output_announce_title,all unittests checked.)
$(call gb_Output_announce_bell)
+slowcheck :
+ $(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),SCHK,6)
+ $(call gb_Output_announce_title,all slowtests checked.)
+ $(call gb_Output_announce_bell)
+
# removing the dependency on build for now until we can make a full build with
gbuild
#subsequentcheck : all
subsequentcheck :
@@ -147,7 +162,7 @@ clean :
$(call gb_Output_announce_title,all cleared.)
$(call gb_Output_announce_bell)
-check : unitcheck
+check : unitcheck slowcheck
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)
@@ -164,6 +179,7 @@ gb_Module_ALLMODULES += $(1)
gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword
$(MAKEFILE_LIST))))
gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1))
$(gb_Module_TARGETSTACK)
gb_Module_CHECKTARGETSTACK := $(call gb_Module_get_check_target,$(1))
$(gb_Module_CHECKTARGETSTACK)
+gb_Module_SLOWCHECKTARGETSTACK := $(call gb_Module_get_slowcheck_target,$(1))
$(gb_Module_SLOWCHECKTARGETSTACK)
gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call
gb_Module_get_subsequentcheck_target,$(1))
$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)
gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1))
$(gb_Module_CLEANTARGETSTACK)
@@ -218,6 +234,14 @@ $(call gb_Module_get_clean_target,$(1)) :
$$(gb_Module_CURRENTCLEANTARGET)
endef
+define gb_Module_add_slowcheck_target
+$(call gb_Module__read_targetfile,$(1),$(2),slowcheck target)
+
+$(call gb_Module_get_slowcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
+$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
+
+endef
+
define gb_Module_add_subsequentcheck_target
$(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
@@ -230,10 +254,12 @@ define gb_Module_add_moduledir
include $(patsubst $(1):%,%,$(filter
$(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
$(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
$(call gb_Module_get_check_target,$(1)) : $$(firstword
$$(gb_Module_CHECKTARGETSTACK))
+$(call gb_Module_get_slowcheck_target,$(1)) : $$(firstword
$$(gb_Module_SLOWCHECKTARGETSTACK))
$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(firstword
$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
$(call gb_Module_get_clean_target,$(1)) : $$(firstword
$$(gb_Module_CLEANTARGETSTACK))
gb_Module_TARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK))
+gb_Module_SLOWCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SLOWCHECKTARGETSTACK)),$$(gb_Module_SLOWCHECKTARGETSTACK))
gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
@@ -249,6 +275,11 @@ $(foreach target,$(2),$(call
gb_Module_add_check_target,$(1),$(target)))
endef
+define gb_Module_add_slowcheck_targets
+$(foreach target,$(2),$(call gb_Module_add_slowcheck_target,$(1),$(target)))
+
+endef
+
define gb_Module_add_subsequentcheck_targets
$(foreach target,$(2),$(call
gb_Module_add_subsequentcheck_target,$(1),$(target)))
@@ -267,6 +298,7 @@ include $(1)
build : $$(firstword $$(gb_Module_TARGETSTACK))
unitcheck : $$(firstword $$(gb_Module_CHECKTARGETSTACK))
+slowcheck : $$(firstword $$(gb_Module_SLOWCHECKTARGETSTACK))
subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
@@ -276,10 +308,11 @@ endif
gb_Module_TARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))
gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK))
+gb_Module_SLOWCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SLOWCHECKTARGETSTACK)),$$(gb_Module_SLOWCHECKTARGETSTACK))
gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
-ifneq ($$(and
$$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),)
+ifneq ($$(and
$$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SLOWCHECKTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),)
$$(eval $$(call gb_Output_error,Corrupted module target stack!3))
endif
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 4dabdac..e6e89f7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -99,6 +99,7 @@ gb_LinkTarget_get_headers_target = $(WORKDIR)/Headers/$(1)
gb_LinkTarget_get_target = $(WORKDIR)/LinkTarget/$(1)
gb_LinkTarget_get_objects_list = $(WORKDIR)/LinkTarget/$(1).objectlist
gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
+gb_Module_get_slowcheck_target = $(WORKDIR)/Module/slowcheck/$(1)
gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
gb_Module_get_target = $(WORKDIR)/Module/$(1)
gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
diff --git a/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
b/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
index 01914a1..53eb67d 100644
--- a/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
+++ b/solenv/gbuild/extensions/post_DisableIosUnitchecks.mk
@@ -28,6 +28,7 @@
# disable check target on IOS
ifeq ($(OS),IOS)
gb_Module_add_check_target=
+gb_Module_add_slowcheck_target=
endif
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index cdc5c2b..a4cc23f 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -45,6 +45,7 @@ endif
ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
gb_Module_add_target=
gb_Module_add_check_target=
+gb_Module_add_slowcheck_target=
gb_Module_add_subsequentcheck_target=
gb_Module_add_moduledir=
gb_FULLDEPS=
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index d93285f..3e17075 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -30,6 +30,7 @@ AVAILABLE TARGETS
all build product and run unit tests (default goal)
build build product
unitcheck run unit tests
+ slowcheck run slow unit tests
subsequentcheck run system tests (requires full installation)
check run unit tests and if in toplevel subsequentcheck
clean remove all generated files
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
