mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild allow unitest to run once per lang in WITH_LANG_LIST

Browse Source 
this is motivated by the new screenshot feature
the initial proposed solution involved running make screenshot once per lang
which took ~6 hours for --with-lang=ALL on tb68 a reasonnably big
windows slavebot.

with this patch, one can run make screenshot just once and get all the screenshot
the elapsed time is 36 inutes on the same box/same config a 10x improvement.

Change-Id: I4339caebf915c118aa455de2a7e56e1a4e413939
Reviewed-on: https://gerrit.libreoffice.org/30970
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Norbert Thiebaud
2016-11-18 16:33:11 -06:00
parent 5507b741cc
commit d8a8ed04b1
19 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/CppunitTest_basctl_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,basctl_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,basctl_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,basctl_dialogs_test, \
basctl/qa/unit/basctl-dialogs-test \

2
chart2/CppunitTest_chart2_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,chart2_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,chart2_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,chart2_dialogs_test, \
chart2/qa/unit/chart2-dialogs-test \

2
cui/CppunitTest_cui_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,cui_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,cui_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,cui_dialogs_test, \
cui/qa/unit/cui-dialogs-test \

2
dbaccess/CppunitTest_dbaccess_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,dbaccess_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_dialogs_test, \
dbaccess/qa/unit/dbaccess-dialogs-test \

2
desktop/CppunitTest_desktop_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,desktop_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,desktop_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,desktop_dialogs_test, \
desktop/qa/unit/desktop-dialogs-test \

2
filter/CppunitTest_filter_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,filter_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,filter_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,filter_dialogs_test, \
filter/qa/unit/filter-dialogs-test \

2
formula/CppunitTest_formula_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,formula_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,formula_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,formula_dialogs_test, \
formula/qa/unit/formula-dialogs-test \

2
fpicker/CppunitTest_fpicker_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,fpicker_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,fpicker_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,fpicker_dialogs_test, \
fpicker/qa/unit/fpicker-dialogs-test \

2
reportdesign/CppunitTest_reportdesign_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,reportdesign_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,reportdesign_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,reportdesign_dialogs_test, \
reportdesign/qa/unit/reportdesign-dialogs-test \

2
sd/CppunitTest_sd_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sd_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,sd_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,sd_dialogs_test, \
sd/qa/unit/dialogs-test \

2
sfx2/CppunitTest_sfx2_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sfx2_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,sfx2_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_dialogs_test, \
sfx2/qa/unit/sfx2-dialogs-test \

16
solenv/gbuild/CppunitTest.mk
View File

@@ -109,7 +109,9 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
$(if $(gb_CppunitTest__interactive),, \
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core && mkdir $@.core && cd $@.core &&)) \
($(if $(filter gdb,$(CPPUNITTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
( \
$(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; do LO_TEST_LOCALE="$$l" ) \
$(if $(filter gdb,$(CPPUNITTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(gb_CppunitTest_malloc_check) \
@@ -119,6 +121,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS)
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktarget,$*)) \
$(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \
$(if $(gb_CppunitTest_localized), ;done ) \
$(if $(gb_CppunitTest__interactive),, \
> $@.log 2>&1 \
|| ($(if $(value gb_CppunitTest_postprocess), \
@@ -131,6 +134,12 @@ $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarge
endef
define gb_CppunitTest_CppunitScreenShot
$(call gb_CppunitTest_get_target,$(1)) : gb_CppunitTest_localized := $(true)
$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1)))
endef
# call gb_CppunitTest__CppunitTest_impl,cppunittest,linktarget
define gb_CppunitTest__CppunitTest_impl
$(call gb_LinkTarget_LinkTarget,$(2),CppunitTest_$(1),NONE)
@@ -226,6 +235,11 @@ $(call gb_CppunitTest__use_vcl,$(1),$(false))
endef
define gb_CppunitTest_localized_run
$(call gb_CppunitTest_get_target,$(1)) : gb_CppunitTest_localized := $(true)
endef
define gb_CppunitTest__use_api
$(call gb_CppunitTest_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(call gb_UnoApi_get_target,$(2))

2
starmath/CppunitTest_starmath_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,starmath_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,starmath_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,starmath_dialogs_test, \
starmath/qa/unit/starmath-dialogs-test \

2
svtools/CppunitTest_svtools_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,svtools_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,svtools_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,svtools_dialogs_test, \
svtools/qa/unit/svtools-dialogs-test \

2
svx/CppunitTest_svx_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,svx_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,svx_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,svx_dialogs_test, \
svx/qa/unit/svx-dialogs-test \

2
sw/CppunitTest_sw_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sw_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,sw_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_dialogs_test, \
sw/qa/unit/sw-dialogs-test \

2
uui/CppunitTest_uui_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,uui_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,uui_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,uui_dialogs_test, \
uui/qa/unit/uui-dialogs-test \

2
vcl/CppunitTest_vcl_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,vcl_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,vcl_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,vcl_dialogs_test, \
vcl/qa/unit/vcl-dialogs-test \

2
xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
View File

@@ -9,7 +9,7 @@
#
#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_dialogs_test))
$(eval $(call gb_CppunitTest_CppunitScreenShot,xmlsecurity_dialogs_test))
$(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_dialogs_test, \
xmlsecurity/qa/unit/xmlsecurity-dialogs-test \