diff options
28 files changed, 118 insertions, 55 deletions
diff --git a/Makefile.in b/Makefile.in index f7f68ed31123..ab0e3564326f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -97,7 +97,7 @@ $(1).clean $(1).showdeliverables: cd $(SRCDIR)/$(2) && $$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) $(1).all: bootstrap fetch - $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1)) + $$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(WORKDIR)/Module/$(1) $(if $(CROSS_COMPILING),,$(WORKDIR)/Module/check/$(1) $(WORKDIR)/Module/slowcheck/$(1) $(WORKDIR)/Module/screenshot/$(1)) endef diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 5954a509f71d..2a174e517840 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -182,7 +182,7 @@ endef # otherwise cyclic dependencies ruin everything. # do not serialize on a partial build as that may fail due to missing deps. # the default goal is all (see Module.mk) -ifeq (,$(filter-out all build check unitcheck slowcheck subsequentcheck uicheck,$(MAKECMDGOALS))) +ifeq (,$(filter-out all build check unitcheck slowcheck screenshot subsequentcheck uicheck,$(MAKECMDGOALS))) $(eval $(call repositorymodule_serialize,\ scfilt \ $(call gb_Helper_optional,SCRIPTING,vbaobj) \ diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 5cedca0af8ae..7d0901c8f96a 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -35,7 +35,8 @@ $(eval $(call gb_Module_add_l10n_targets,basctl,\ UIConfig_basicide \ )) -$(eval $(call gb_Module_add_slowcheck_targets,basctl,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,basctl,\ CppunitTest_basctl_dialogs_test \ )) diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index a4b837b453a4..049292016ffb 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -561,16 +561,16 @@ isExecutable=true result = KdevelopIntegrationGenerator.launchestemplate % {'launches': launches} result += self.generate_launch(0, 'Local tests -- quick tests (unitcheck)', self.gbuildparser.makecmd, 'unitcheck', moduledir) - result += self.generate_launch(1, 'Local tests -- slow tests (unitcheck, slowcheck)', self.gbuildparser.makecmd, - 'unitcheck slowcheck', moduledir) - result += self.generate_launch(2, 'Local tests -- integration tests (unitcheck, slowcheck, subsequentcheck)', - self.gbuildparser.makecmd, 'unitcheck slowcheck subsequentcheck', moduledir) + result += self.generate_launch(1, 'Local tests -- slow tests (unitcheck, slowcheck, screenshot)', self.gbuildparser.makecmd, + 'unitcheck slowcheck screenshot', moduledir) + result += self.generate_launch(2, 'Local tests -- integration tests (unitcheck, slowcheck, screenshot, subsequentcheck)', + self.gbuildparser.makecmd, 'unitcheck slowcheck screenshot subsequentcheck', moduledir) result += self.generate_launch(3, 'Global tests -- quick tests (unitcheck)', self.gbuildparser.makecmd, 'unitcheck', self.gbuildparser.builddir) - result += self.generate_launch(4, 'Global tests -- slow tests (unitcheck, slowcheck)', - self.gbuildparser.makecmd, 'unitcheck slowcheck', self.gbuildparser.builddir) - result += self.generate_launch(5, 'Global tests -- integration tests (unitcheck, slowcheck, subsequentcheck)', - self.gbuildparser.makecmd, 'unitcheck slowcheck subsequentcheck', + result += self.generate_launch(4, 'Global tests -- slow tests (unitcheck, slowcheck, screenshot)', + self.gbuildparser.makecmd, 'unitcheck slowcheck screenshot', self.gbuildparser.builddir) + result += self.generate_launch(5, 'Global tests -- integration tests (unitcheck, slowcheck, screenshot, subsequentcheck)', + self.gbuildparser.makecmd, 'unitcheck slowcheck screenshot subsequentcheck', self.gbuildparser.builddir) result += self.generate_launch(6, 'Run LibreOffice', os.path.join(self.gbuildparser.instdir, 'program/soffice.bin'), '', @@ -826,9 +826,9 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): 'rebuild': self.module_make_command('clean unitcheck'), }, 'Integration tests': { - 'build': self.module_make_command('unitcheck slowcheck subsequentcheck'), + 'build': self.module_make_command('unitcheck slowcheck screenshot subsequentcheck'), 'clean': self.module_make_command('clean'), - 'rebuild': self.module_make_command('clean unitcheck slowcheck subsequentcheck') + 'rebuild': self.module_make_command('clean unitcheck slowcheck screenshot subsequentcheck') } } @@ -1102,14 +1102,14 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator): xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '2', 'base_folder': module_folder, - 'arg': "unitcheck slowcheck", - 'name': "3-Local tests -- slow tests (unitcheck, slowcheck)", + 'arg': "unitcheck slowcheck screenshot", + 'name': "3-Local tests -- slow tests (unitcheck, slowcheck, screenshot)", } xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '3', 'base_folder': module_folder, - 'arg': "unitcheck slowcheck subsequentcheck", - 'name': "4-Local tests -- integration tests (unitcheck, slowcheck, subsequentcheck)", + 'arg': "unitcheck slowcheck screenshot subsequentcheck", + 'name': "4-Local tests -- integration tests (unitcheck, slowcheck, screenshot, subsequentcheck)", } xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '4', @@ -1120,14 +1120,14 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator): xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '5', 'base_folder': self.base_folder, - 'arg': "unitcheck slowcheck", - 'name': "6-Global tests -- slow tests (unitcheck, slowcheck)", + 'arg': "unitcheck slowcheck screenshot", + 'name': "6-Global tests -- slow tests (unitcheck, slowcheck, screenshot)", } xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '6', 'base_folder': self.base_folder, - 'arg': "unitcheck slowcheck subsequentcheck", - 'name': "7-Global tests -- integration tests (unitcheck, slowcheck, subsequentcheck)", + 'arg': "unitcheck slowcheck screenshot subsequentcheck", + 'name': "7-Global tests -- integration tests (unitcheck, slowcheck, screenshot, subsequentcheck)", } xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '7', @@ -1167,14 +1167,14 @@ class QtCreatorIntegrationGenerator(IdeIntegrationGenerator): xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '2', 'base_folder': self.base_folder, - 'arg': "unitcheck slowcheck", - 'name': "03-Global tests -- slow tests (unitcheck, slowcheck)", + 'arg': "unitcheck slowcheck screenshot", + 'name': "03-Global tests -- slow tests (unitcheck, slowcheck, screenshot)", } xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '3', 'base_folder': self.base_folder, - 'arg': "unitcheck slowcheck subsequentcheck", - 'name': "04-Global tests -- integration tests (unitcheck, slowcheck, subsequentcheck)", + 'arg': "unitcheck slowcheck screenshot subsequentcheck", + 'name': "04-Global tests -- integration tests (unitcheck, slowcheck, screenshot, subsequentcheck)", } xml += QtCreatorIntegrationGenerator.build_configs_template % { 'index': '4', diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index 0d9c3f3445ba..705321f02eb1 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -46,7 +46,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\ JunitTest_chart2_unoapi \ )) -$(eval $(call gb_Module_add_slowcheck_targets,chart2,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,chart2,\ CppunitTest_chart2_dialogs_test \ )) diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk index 9bd48b8806eb..0b217070d599 100644 --- a/cui/Module_cui.mk +++ b/cui/Module_cui.mk @@ -18,7 +18,8 @@ $(eval $(call gb_Module_add_l10n_targets,cui,\ UIConfig_cui \ )) -$(eval $(call gb_Module_add_slowcheck_targets,cui,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,cui,\ CppunitTest_cui_dialogs_test \ )) diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index af8becd66ad8..9c2a1254e4f9 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -78,7 +78,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ endif endif -$(eval $(call gb_Module_add_slowcheck_targets,dbaccess,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,dbaccess,\ CppunitTest_dbaccess_dialogs_test \ )) diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 24255d9d4c5e..5a6604c86b6c 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -141,7 +141,8 @@ $(eval $(call gb_Module_add_check_targets,desktop, \ )) endif -$(eval $(call gb_Module_add_slowcheck_targets,desktop,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,desktop,\ CppunitTest_desktop_dialogs_test \ )) diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 204d208bb1bb..9b6421cfcaa5 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -84,7 +84,8 @@ endif JunitTest_filter_complex \ )) -$(eval $(call gb_Module_add_slowcheck_targets,filter,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,filter,\ CppunitTest_filter_dialogs_test \ )) diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk index 6a3833bfc2e1..7543a474652c 100644 --- a/formula/Module_formula.mk +++ b/formula/Module_formula.mk @@ -20,7 +20,8 @@ $(eval $(call gb_Module_add_l10n_targets,formula,\ UIConfig_formula \ )) -$(eval $(call gb_Module_add_slowcheck_targets,formula,\ +# screenshots +$(eval $(call gb_Module_add_screeshot_targets,formula,\ CppunitTest_formula_dialogs_test \ )) diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk index 2805ca7a1a45..12173551565a 100644 --- a/fpicker/Module_fpicker.mk +++ b/fpicker/Module_fpicker.mk @@ -32,7 +32,8 @@ $(eval $(call gb_Module_add_targets,fpicker,\ )) endif -$(eval $(call gb_Module_add_slowcheck_targets,fpicker,\ +# screenshots +$(eval $(call gb_Module_add_screeshot_targets,fpicker,\ CppunitTest_fpicker_dialogs_test \ )) diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 23a81ef68654..29b0532bd198 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -23,7 +23,8 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(call gb_Postprocess_get_target,AllLibraries) \ $(call gb_Postprocess_get_target,AllExecutables) \ $(call gb_Postprocess_get_target,AllModuleTests) \ - $(call gb_Postprocess_get_target,AllModuleSlowtests) + $(call gb_Postprocess_get_target,AllModuleSlowtests) \ + $(call gb_Postprocess_get_target,AllModuleScreenshots) $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index a06efb02694b..518addb5bd2c 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -27,7 +27,8 @@ $(eval $(call gb_Module_add_l10n_targets,reportdesign,\ JunitTest_reportdesign_complex \ )) -$(eval $(call gb_Module_add_slowcheck_targets,reportdesign,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,reportdesign,\ CppunitTest_reportdesign_dialogs_test \ )) diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index e9a49ef9cb2b..05af307fbc0f 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_opencl_test \ CppunitTest_sc_copypaste \ CppunitTest_sc_functions_test \ - CppunitTest_sc_screenshots \ )) # Disabled to allow the check tinderbox execute the sd tests @@ -110,5 +109,9 @@ $(eval $(call gb_Module_add_perfcheck_targets,sc,\ CppunitTest_sc_tablesheetobj \ )) +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,sc,\ + CppunitTest_sc_screenshots \ +)) # vim: set noet sw=4 ts=4: diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 1171eb899fdf..62bfd8988778 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -46,7 +46,8 @@ $(eval $(call gb_Module_add_check_targets,sd,\ )) endif -$(eval $(call gb_Module_add_slowcheck_targets,sd, \ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,sd, \ CppunitTest_sd_dialogs_test \ )) diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 4f6f4b43e7b2..d892973ddc5c 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -61,7 +61,8 @@ endif #todo: clean up quickstarter stuff in both libraries #todo: move standard pool to svl -$(eval $(call gb_Module_add_slowcheck_targets,sfx2,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,sfx2,\ CppunitTest_sfx2_dialogs_test \ )) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index d4217ea75b41..eb558a8033ac 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -26,12 +26,14 @@ # Module/unitcheck run unit tests all unit tests # recursive Module/checks # Module/slowcheck run all slow unit tests +# Module/screenshot create all screenshots # Module/subsequentcheck run system tests all system tests # Module/uicheck run uitests all uitests # 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 +# screenshot (global) create all screenshots top-level Module/screenshot # subsequentcheck (global) run system tests top-level Module/subsequentcheck # perfcheck (global) run performance unit tests top-level Module/perfcheck # uicheck (global) run the uitests run all uitests @@ -46,6 +48,7 @@ gb_Module_TARGETSTACK := gb_Module_L10NTARGETSTACK := gb_Module_CHECKTARGETSTACK := gb_Module_SLOWCHECKTARGETSTACK := +gb_Module_SCREENSHOTTARGETSTACK := gb_Module_SUBSEQUENTCHECKTARGETSTACK := gb_Module_STAGINGCHECKTARGETSTACK := gb_Module_PERFCHECKTARGETSTACK := @@ -71,7 +74,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_nonl10n_target,$*) $(call gb_Module_get_l10n_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call gb_Module_get_subsequentcheck_target,$*) $(call gb_Module_get_perfcheck_target,$*) $(call gb_Module_get_uicheck,$*)) + rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_nonl10n_target,$*) $(call gb_Module_get_l10n_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call gb_Module_get_screenshot_target,$*) $(call gb_Module_get_subsequentcheck_target,$*) $(call gb_Module_get_perfcheck_target,$*) $(call gb_Module_get_uicheck,$*)) $(call gb_Module_get_l10n_target,%) : $(call gb_Output_announce,$*,$(true),LOC,5) @@ -94,6 +97,13 @@ $(call gb_Module_get_slowcheck_target,%) : mkdir -p $(dir $@) && \ touch $@) +$(call gb_Module_get_screenshot_target,%) : + $(call gb_Output_announce,$*,$(true),SCR,5) + $(call gb_Output_announce_title,module $* screenshots 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.) @@ -129,7 +139,7 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) && \ touch $@) -.PHONY : all build build-l10n-only build-non-l10n-only unitcheck slowcheck subsequentcheck stagingcheck perfcheck uicheck clean check debugrun help showmodules translations +.PHONY : all build build-l10n-only build-non-l10n-only unitcheck slowcheck screenshot subsequentcheck stagingcheck perfcheck uicheck clean check debugrun help showmodules translations .DEFAULT_GOAL := all all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)) @@ -167,6 +177,11 @@ slowcheck : $(call gb_Output_announce_title,all slowtests checked.) $(call gb_Output_announce_bell) +screenshot : + $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),SCR,6)) + $(call gb_Output_announce_title,all screenshots 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 : @@ -232,6 +247,7 @@ gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTA gb_Module_L10NTARGETSTACK := $(call gb_Module_get_l10n_target,$(1)) $(gb_Module_L10NTARGETSTACK) 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_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) @@ -245,6 +261,7 @@ $(if $(filter-out libreoffice instsetoo_native android ios,$(1)),\ $(call gb_Postprocess_get_target,AllModuleTests) : $(call gb_Module_get_check_target,$(1)) $(call gb_Postprocess_get_target,AllModuleSlowtests) : $(call gb_Module_get_slowcheck_target,$(1)) +$(call gb_Postprocess_get_target,AllModuleScreenshots) : $(call gb_Module_get_screenshot_target,$(1)) $(call gb_Postprocess_get_target,AllModuleUITest) : $(call gb_Module_get_uicheck_target,$(1)) endef @@ -306,6 +323,14 @@ $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef +define gb_Module_add_screenshot_target +$(call gb_Module__read_targetfile,$(1),$(2),screenshot target) + +$(call gb_Module_get_screenshot_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$(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 @@ -355,6 +380,7 @@ $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK)) $(call gb_Module_get_l10n_target,$(1)) : $$(firstword $$(gb_Module_L10NTARGETSTACK)) $(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_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)) @@ -364,6 +390,7 @@ gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb gb_Module_L10NTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_L10NTARGETSTACK)),$$(gb_Module_L10NTARGETSTACK)) 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_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)) @@ -396,6 +423,11 @@ $(foreach target,$(2),$(call gb_Module_add_slowcheck_target,$(1),$(target))) endef +define gb_Module_add_screenshot_targets +$(foreach target,$(2),$(call gb_Module_add_screenshot_target,$(1),$(target))) + +endef + define gb_Module_add_subsequentcheck_targets $(foreach target,$(2),$(call gb_Module_add_subsequentcheck_target,$(1),$(target))) @@ -433,6 +465,7 @@ build-non-l10n-only : $$(firstword $$(gb_Module_TARGETSTACK)) build-l10n-only : $$(firstword $$(gb_Module_L10NTARGETSTACK)) unitcheck : $$(firstword $$(gb_Module_CHECKTARGETSTACK)) slowcheck : $$(firstword $$(gb_Module_SLOWCHECKTARGETSTACK)) +screenshot : $$(firstword $$(gb_Module_SCREENSHOTTARGETSTACK)) subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) stagingcheck : $$(firstword $$(gb_Module_STAGINGCHECKTARGETSTACK)) perfcheck : $$(firstword $$(gb_Module_PERFCHECKTARGETSTACK)) @@ -447,13 +480,14 @@ gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb gb_Module_L10NTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_L10NTARGETSTACK)),$$(gb_Module_L10NTARGETSTACK)) 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_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_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_STAGINGCHECKTARGETSTACK),$$(gb_Module_PERFCHECKTARGETSTACK),$$(gb_Module_L10NTARGETSTACK)),) $$(eval $$(call gb_Output_error,Corrupted module target stack!3)) endif diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index a256a210552c..5b20a6686cfe 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -47,6 +47,7 @@ $(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangR $(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/) $(call gb_Postprocess_Postprocess,AllModuleTests,All modules' tests,$(WORKDIR)/Module/check/) $(call gb_Postprocess_Postprocess,AllModuleSlowtests,All modules' slowtests,$(WORKDIR)/Module/slowcheck/) +$(call gb_Postprocess_Postprocess,AllModuleScreenshots,All modules' screenshots,$(WORKDIR)/Module/screenshot/) $(call gb_Postprocess_Postprocess,AllModuleUITests,All modules' uitests,$(WORKDIR)/Module/uicheck/) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 34577cadca03..3cf0cdf6e606 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -118,6 +118,7 @@ gb_Module_get_nonl10n_target = $(WORKDIR)/Module/nonl10n/$(1) gb_Module_get_l10n_target = $(WORKDIR)/Module/l10n/$(1) 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) diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 921038e4821f..3db6355ab90d 100644 --- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk +++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk @@ -9,21 +9,21 @@ ifneq ($(CROSS_COMPILING),) gb_Module_add_targets_for_build := -gb_Module_SKIPTARGETS := check slowcheck subsequentcheck uicheck +gb_Module_SKIPTARGETS := check slowcheck screenshot subsequentcheck uicheck endif ifeq ($(gb_Side),build) -gb_Module_SKIPTARGETS := check slowcheck subsequentcheck uicheck +gb_Module_SKIPTARGETS := check slowcheck screenshot subsequentcheck uicheck endif ifeq ($(MAKECMDGOALS),build) -gb_Module_SKIPTARGETS := check slowcheck subsequentcheck uicheck +gb_Module_SKIPTARGETS := check slowcheck screenshot subsequentcheck uicheck endif ifeq (,$(filter perfcheck,$(MAKECMDGOALS))) gb_Module_SKIPTARGETS += perfcheck else -gb_Module_SKIPTARGETS += check slowcheck subsequentcheck uicheck +gb_Module_SKIPTARGETS += check slowcheck screenshot subsequentcheck uicheck endif ifneq ($(strip $(MAKECMDGOALS)),) @@ -37,7 +37,7 @@ ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_1),$(MAKECMDGOALS)),,T)) gb_FULLDEPS := ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_2),$(MAKECMDGOALS)),,T)) -gb_Module_SKIPTARGETS += check slowcheck subsequentcheck uicheck +gb_Module_SKIPTARGETS += check slowcheck screenshot subsequentcheck uicheck ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_3),$(MAKECMDGOALS)),,T)) gb_Module_SKIPTARGETS += build @@ -65,6 +65,10 @@ ifneq (,$(filter slowcheck,$(gb_Module_SKIPTARGETS))) gb_Module_add_slowcheck_target = endif +ifneq (,$(filter screenshot,$(gb_Module_SKIPTARGETS))) +gb_Module_add_screenshot_target = +endif + ifneq (,$(filter subsequentcheck,$(gb_Module_SKIPTARGETS))) gb_Module_add_subsequentcheck_target = endif diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt index bbf74f79e785..a7903349b89c 100644 --- a/solenv/gbuild/gbuild.help.txt +++ b/solenv/gbuild/gbuild.help.txt @@ -36,6 +36,7 @@ AVAILABLE TARGETS check run unit tests and if in toplevel subsequentcheck unitcheck run unit tests 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) diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 58fc7fef4570..004921143316 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -30,7 +30,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\ JunitTest_starmath_unoapi \ )) -$(eval $(call gb_Module_add_slowcheck_targets,starmath,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,starmath,\ CppunitTest_starmath_dialogs_test \ )) diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk index 2062ce7fcfcc..7e28e4211ffd 100644 --- a/svtools/Module_svtools.mk +++ b/svtools/Module_svtools.mk @@ -49,7 +49,8 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,svtools,\ )) endif -$(eval $(call gb_Module_add_slowcheck_targets,svtools,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,svtools,\ CppunitTest_svtools_dialogs_test \ )) diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 7739dcfab254..c8bf3a3b7729 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -36,7 +36,8 @@ $(eval $(call gb_Module_add_check_targets,svx,\ CppunitTest_svx_unit \ )) -$(eval $(call gb_Module_add_slowcheck_targets,svx,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,svx,\ CppunitTest_svx_dialogs_test \ )) diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index d635f4c569f0..3341552ea8b1 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -85,10 +85,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ )) endif -$(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_dialogs_test \ -)) - ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ JunitTest_sw_complex \ @@ -105,4 +101,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ )) endif +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,sw,\ + CppunitTest_sw_dialogs_test \ +)) + # vim: set noet sw=4 ts=4: diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk index 0f197a363d2b..436efbfcb09c 100644 --- a/uui/Module_uui.mk +++ b/uui/Module_uui.mk @@ -18,7 +18,8 @@ $(eval $(call gb_Module_add_l10n_targets,uui,\ UIConfig_uui \ )) -$(eval $(call gb_Module_add_slowcheck_targets,uui,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,uui,\ CppunitTest_uui_dialogs_test \ )) diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 5d5a2ac1e39d..ad08e5988a7b 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -130,7 +130,8 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ )) endif -$(eval $(call gb_Module_add_slowcheck_targets,vcl,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,vcl,\ CppunitTest_vcl_dialogs_test \ )) diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index 63b2f8c545d7..3c9b220dafd7 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -31,7 +31,8 @@ $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\ CppunitTest_qa_certext \ )) -$(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\ +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\ CppunitTest_xmlsecurity_dialogs_test \ )) |