basctl/CppunitTest_basctl_dialogs_test.mk | 2 +-
chart2/CppunitTest_chart2_dialogs_test.mk | 2 +-
cui/CppunitTest_cui_dialogs_test.mk | 2 +-
dbaccess/CppunitTest_dbaccess_dialogs_test.mk | 2 +-
desktop/CppunitTest_desktop_dialogs_test.mk | 2 +-
filter/CppunitTest_filter_dialogs_test.mk | 2 +-
formula/CppunitTest_formula_dialogs_test.mk | 2 +-
fpicker/CppunitTest_fpicker_dialogs_test.mk | 2 +-
reportdesign/CppunitTest_reportdesign_dialogs_test.mk | 2 +-
sd/CppunitTest_sd_dialogs_test.mk | 2 +-
sfx2/CppunitTest_sfx2_dialogs_test.mk | 2 +-
solenv/gbuild/CppunitTest.mk | 16 +++++++++++++++-
starmath/CppunitTest_starmath_dialogs_test.mk | 2 +-
svtools/CppunitTest_svtools_dialogs_test.mk | 2 +-
svx/CppunitTest_svx_dialogs_test.mk | 2 +-
sw/CppunitTest_sw_dialogs_test.mk | 2 +-
uui/CppunitTest_uui_dialogs_test.mk | 2 +-
vcl/CppunitTest_vcl_dialogs_test.mk | 2 +-
xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk | 2 +-
19 files changed, 33 insertions(+), 19 deletions(-)
New commits:
commit d8a8ed04b14390d4469ea19b079778fa6f074bb2
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri Nov 18 16:33:11 2016 -0600
gbuild allow unitest to run once per lang in WITH_LANG_LIST
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 <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk
b/basctl/CppunitTest_basctl_dialogs_test.mk
index 03a0287..a358372 100644
--- a/basctl/CppunitTest_basctl_dialogs_test.mk
+++ b/basctl/CppunitTest_basctl_dialogs_test.mk
@@ -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 \
diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk
b/chart2/CppunitTest_chart2_dialogs_test.mk
index a58559c..b7dd867 100644
--- a/chart2/CppunitTest_chart2_dialogs_test.mk
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -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 \
diff --git a/cui/CppunitTest_cui_dialogs_test.mk
b/cui/CppunitTest_cui_dialogs_test.mk
index fa5d4e0..223404a 100644
--- a/cui/CppunitTest_cui_dialogs_test.mk
+++ b/cui/CppunitTest_cui_dialogs_test.mk
@@ -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 \
diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
index 6a3ee19..fbc4ebe 100644
--- a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
@@ -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 \
diff --git a/desktop/CppunitTest_desktop_dialogs_test.mk
b/desktop/CppunitTest_desktop_dialogs_test.mk
index bffa591..a00620c 100644
--- a/desktop/CppunitTest_desktop_dialogs_test.mk
+++ b/desktop/CppunitTest_desktop_dialogs_test.mk
@@ -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 \
diff --git a/filter/CppunitTest_filter_dialogs_test.mk
b/filter/CppunitTest_filter_dialogs_test.mk
index 018bc63..b901076 100644
--- a/filter/CppunitTest_filter_dialogs_test.mk
+++ b/filter/CppunitTest_filter_dialogs_test.mk
@@ -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 \
diff --git a/formula/CppunitTest_formula_dialogs_test.mk
b/formula/CppunitTest_formula_dialogs_test.mk
index 3dacdc0..d12f2d9 100644
--- a/formula/CppunitTest_formula_dialogs_test.mk
+++ b/formula/CppunitTest_formula_dialogs_test.mk
@@ -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 \
diff --git a/fpicker/CppunitTest_fpicker_dialogs_test.mk
b/fpicker/CppunitTest_fpicker_dialogs_test.mk
index 0caf7e7..079f759 100644
--- a/fpicker/CppunitTest_fpicker_dialogs_test.mk
+++ b/fpicker/CppunitTest_fpicker_dialogs_test.mk
@@ -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 \
diff --git a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
index 07d56585..932ff6e 100644
--- a/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
+++ b/reportdesign/CppunitTest_reportdesign_dialogs_test.mk
@@ -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 \
diff --git a/sd/CppunitTest_sd_dialogs_test.mk
b/sd/CppunitTest_sd_dialogs_test.mk
index 04571a2..6bbce33 100644
--- a/sd/CppunitTest_sd_dialogs_test.mk
+++ b/sd/CppunitTest_sd_dialogs_test.mk
@@ -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 \
diff --git a/sfx2/CppunitTest_sfx2_dialogs_test.mk
b/sfx2/CppunitTest_sfx2_dialogs_test.mk
index 5c6087f..1ea68c0 100644
--- a/sfx2/CppunitTest_sfx2_dialogs_test.mk
+++ b/sfx2/CppunitTest_sfx2_dialogs_test.mk
@@ -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 \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e8cbcc9..4a9c050 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -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))
diff --git a/starmath/CppunitTest_starmath_dialogs_test.mk
b/starmath/CppunitTest_starmath_dialogs_test.mk
index 4ef798e..d5e6866 100644
--- a/starmath/CppunitTest_starmath_dialogs_test.mk
+++ b/starmath/CppunitTest_starmath_dialogs_test.mk
@@ -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 \
diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk
b/svtools/CppunitTest_svtools_dialogs_test.mk
index 6341850..38b50cb 100644
--- a/svtools/CppunitTest_svtools_dialogs_test.mk
+++ b/svtools/CppunitTest_svtools_dialogs_test.mk
@@ -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 \
diff --git a/svx/CppunitTest_svx_dialogs_test.mk
b/svx/CppunitTest_svx_dialogs_test.mk
index 4773f33..cf84194 100644
--- a/svx/CppunitTest_svx_dialogs_test.mk
+++ b/svx/CppunitTest_svx_dialogs_test.mk
@@ -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 \
diff --git a/sw/CppunitTest_sw_dialogs_test.mk
b/sw/CppunitTest_sw_dialogs_test.mk
index 3bb3ac2..42ae22b 100644
--- a/sw/CppunitTest_sw_dialogs_test.mk
+++ b/sw/CppunitTest_sw_dialogs_test.mk
@@ -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 \
diff --git a/uui/CppunitTest_uui_dialogs_test.mk
b/uui/CppunitTest_uui_dialogs_test.mk
index 5df7500..9c7ed39 100644
--- a/uui/CppunitTest_uui_dialogs_test.mk
+++ b/uui/CppunitTest_uui_dialogs_test.mk
@@ -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 \
diff --git a/vcl/CppunitTest_vcl_dialogs_test.mk
b/vcl/CppunitTest_vcl_dialogs_test.mk
index b594015..2bebfe4 100644
--- a/vcl/CppunitTest_vcl_dialogs_test.mk
+++ b/vcl/CppunitTest_vcl_dialogs_test.mk
@@ -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 \
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
index ba72c00..f30b5c2 100644
--- a/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
+++ b/xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk
@@ -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 \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
