solenv/gbuild/Module.mk | 41 +--------------------------------------
solenv/gbuild/TargetLocations.mk | 1
solenv/gbuild/gbuild.help.txt | 2 -
3 files changed, 2 insertions(+), 42 deletions(-)
New commits:
commit daa8e90fc919dd8150c819e342b3f96739d94ca2
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Dec 13 15:59:30 2021 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Dec 14 07:37:14 2021 +0100
Revert "add stagingcheck target for unstable/failing tests"
This reverts commit c1f47481eb78df3d73bed1da5020ed6ea565a999.
Conflicts:
solenv/gbuild/Module.mk
solenv/gbuild/gbuild.help.txt
It has apparently never been used.
Change-Id: I18a47d740c0a78ae295a60257207ecce66f38a8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126741
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index fcedbc95f248..bb915f5034cb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -49,7 +49,6 @@ gb_Module_CHECKTARGETSTACK :=
gb_Module_SLOWCHECKTARGETSTACK :=
gb_Module_SCREENSHOTTARGETSTACK :=
gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
-gb_Module_STAGINGCHECKTARGETSTACK :=
gb_Module_PERFCHECKTARGETSTACK :=
gb_Module_UICHECKTARGETSTACK :=
gb_Module_CLEANTARGETSTACK :=
@@ -116,14 +115,6 @@ $(call gb_Module_get_subsequentcheck_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-$(call gb_Module_get_stagingcheck_target,%) :
- $(call gb_Output_announce,$*,$(true),STC,5)
- $(call gb_Trace_MakeMark,$*,STC)
- $(call gb_Output_announce_title,module $* stagingchecks done.)
- -$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $@) && \
- touch $@)
-
$(call gb_Module_get_perfcheck_target,%) :
$(call gb_Output_announce,$*,$(true),PFC,5)
$(call gb_Trace_MakeMark,$*,PFC)
@@ -148,7 +139,7 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : build build-l10n-only build-non-l10n-only unitcheck slowcheck
screenshot subsequentcheck stagingcheck perfcheck uicheck clean check debugrun
help showmodules translations
+.PHONY : build build-l10n-only build-non-l10n-only unitcheck slowcheck
screenshot subsequentcheck perfcheck uicheck clean check debugrun help
showmodules translations
.DEFAULT_GOAL := build
ifeq ($(gb_Side),build)
@@ -202,11 +193,6 @@ subsequentcheck :
$(call gb_Output_announce_title,all subsequent tests checked.)
$(call gb_Output_announce_bell)
-stagingcheck :
- $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),STC,6))
- $(call gb_Output_announce_title,all staging tests checked.)
- $(call gb_Output_announce_bell)
-
perfcheck :
$(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort
$(gb_Module_ALLMODULES)),$(true),PFC,6))
$(call gb_Output_announce_title,all perftests checked.)
@@ -271,7 +257,6 @@ gb_Module_SLOWCHECKTARGETSTACK := $(call
gb_Module_get_slowcheck_target,$(1)) $(
gb_Module_SCREENSHOTTARGETSTACK := $(call
gb_Module_get_screenshot_target,$(1)) $(gb_Module_SCREENSHOTTARGETSTACK)
gb_Module_UICHECKTARGETSTACK := $(call gb_Module_get_uicheck_target,$(1))
$(gb_Module_UICHECKTARGETSTACK)
gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call
gb_Module_get_subsequentcheck_target,$(1))
$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)
-gb_Module_STAGINGCHECKTARGETSTACK := $(call
gb_Module_get_stagingcheck_target,$(1)) $(gb_Module_STAGINGCHECKTARGETSTACK)
gb_Module_PERFCHECKTARGETSTACK := $(call gb_Module_get_perfcheck_target,$(1))
$(gb_Module_PERFCHECKTARGETSTACK)
gb_Module_CLEANTARGETSTACK := $(call gb_Module_get_clean_target,$(1))
$(gb_Module_CLEANTARGETSTACK)
gb_Module_CURRENTMODULE_SYMBOLS_ENABLED := $(call
gb_Module__symbols_enabled,$(1),$(notdir $(realpath $(dir $(realpath $(lastword
$(MAKEFILE_LIST))))../)))
@@ -367,19 +352,6 @@ $(call gb_Module_get_clean_target,$(1)) :
$$(gb_Module_CURRENTCLEANTARGET)
endef
-define gb_Module_add_stagingcheck_target
-$(info adding stagingcheck $(1) $(2))
-$(call gb_Module__read_targetfile,$(1),$(2),stagingcheck target)
-
-$(call gb_Module_get_stagingcheck_target,$(1)) : $$(gb_Module_CURRENTTARGET)
-$$(gb_Module_CURRENTTARGET) :| \
- $(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
- $(call gb_Package_get_target,instsetoo_native_setup) \
- $(call gb_Package_get_target,instsetoo_native_setup_ure)
-$(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
-
-endef
-
define gb_Module_add_perfcheck_target
$(call gb_Module__read_targetfile,$(1),$(2),perfcheck target)
@@ -414,7 +386,6 @@ $(call gb_Module_get_check_target,$(1)) : $$(firstword
$$(gb_Module_CHECKTARGETS
$(call gb_Module_get_slowcheck_target,$(1)) : $$(firstword
$$(gb_Module_SLOWCHECKTARGETSTACK))
$(call gb_Module_get_screenshot_target,$(1)) : $$(firstword
$$(gb_Module_SCREENSHOTTARGETSTACK))
$(call gb_Module_get_subsequentcheck_target,$(1)) : $$(firstword
$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
-$(call gb_Module_get_stagingcheck_target,$(1)) : $$(firstword
$$(gb_Module_STAGINGCHECKTARGETSTACK))
$(call gb_Module_get_perfcheck_target,$(1)) : $$(firstword
$$(gb_Module_PERFCHECKTARGETSTACK))
$(call gb_Module_get_uicheck_target,$(1)) : $$(firstword
$$(gb_Module_UICHECKTARGETSTACK))
$(call gb_Module_get_clean_target,$(1)) : $$(firstword
$$(gb_Module_CLEANTARGETSTACK))
@@ -424,7 +395,6 @@ gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_CHECKTARGETSTA
gb_Module_SLOWCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SLOWCHECKTARGETSTACK)),$$(gb_Module_SLOWCHECKTARGETSTACK))
gb_Module_SCREENSHOTTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SCREENSHOTTARGETSTACK)),$$(gb_Module_SCREENSHOTTARGETSTACK))
gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
-gb_Module_STAGINGCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_STAGINGCHECKTARGETSTACK)),$$(gb_Module_STAGINGCHECKTARGETSTACK))
gb_Module_PERFCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_PERFCHECKTARGETSTACK)),$$(gb_Module_PERFCHECKTARGETSTACK))
gb_Module_UICHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_UICHECKTARGETSTACK)),$$(gb_Module_UICHECKTARGETSTACK))
gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
@@ -465,11 +435,6 @@ $(foreach target,$(2),$(call
gb_Module_add_subsequentcheck_target,$(1),$(target)
endef
-define gb_Module_add_stagingcheck_targets
-$(foreach target,$(2),$(call gb_Module_add_stagingcheck_target,$(1),$(target)))
-
-endef
-
define gb_Module_add_perfcheck_targets
$(foreach target,$(2),$(call gb_Module_add_perfcheck_target,$(1),$(target)))
@@ -502,7 +467,6 @@ ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
screenshot : $(call
gb_CustomTarget_get_workdir,postprocess/signing)/signing.done
endif
subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
-stagingcheck : $$(firstword $$(gb_Module_STAGINGCHECKTARGETSTACK))
perfcheck : $$(firstword $$(gb_Module_PERFCHECKTARGETSTACK))
uicheck : build $$(firstword $$(gb_Module_UICHECKTARGETSTACK))
clean : $$(firstword $$(gb_Module_CLEANTARGETSTACK))
@@ -518,11 +482,10 @@ gb_Module_SLOWCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SLOWCHECKT
gb_Module_SCREENSHOTTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SCREENSHOTTARGETSTACK)),$$(gb_Module_SCREENSHOTTARGETSTACK))
gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK))
gb_Module_UICHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_UICHECKTARGETSTACK)),$$(gb_Module_UICHECKTARGETSTACK))
-gb_Module_STAGINGCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_STAGINGCHECKTARGETSTACK)),$$(gb_Module_STAGINGCHECKTARGETSTACK))
gb_Module_PERFCHECKTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_PERFCHECKTARGETSTACK)),$$(gb_Module_PERFCHECKTARGETSTACK))
gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words
$$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK))
-ifneq ($$(and
$$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SLOWCHECKTARGETSTACK),$$(gb_Module_SCREENSHOTTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK),$$(gb_Module_UICHECKTARGETSTACK),$$(gb_Module_STAGINGCHECKTARGETSTACK),$$(gb_Module_PERFCHECKTARGETSTACK),$$(gb_Module_L10NTARGETSTACK)),)
+ifneq ($$(and
$$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SLOWCHECKTARGETSTACK),$$(gb_Module_SCREENSHOTTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK),$$(gb_Module_UICHECKTARGETSTACK),$$(gb_Module_PERFCHECKTARGETSTACK),$$(gb_Module_L10NTARGETSTACK)),)
$$(eval $$(call gb_Output_error,Corrupted module target stack!3))
endif
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e65e0759a2ab..24e1210b2563 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -132,7 +132,6 @@ gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
gb_Module_get_slowcheck_target = $(WORKDIR)/Module/slowcheck/$(1)
gb_Module_get_screenshot_target = $(WORKDIR)/Module/screenshot/$(1)
gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
-gb_Module_get_stagingcheck_target = $(WORKDIR)/Module/stagingcheck/$(1)
gb_Module_get_perfcheck_target = $(WORKDIR)/Module/perfcheck/$(1)
gb_Module_get_uicheck_target = $(WORKDIR)/Module/uicheck/$(1)
gb_Module_get_target = $(WORKDIR)/Module/$(1)
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 65cc4ce6d689..7bc625c8ce0f 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -38,8 +38,6 @@ AVAILABLE TARGETS
slowcheck run slow unit tests
screenshot create all screenshots
subsequentcheck run system tests (requires full installation)
- stagingcheck run (unstable/failing) tests from staging area
- (requires full installation)
perfcheck run performance/callgrind unit tests
build-l10n-only builds translation files for the build products
