From 8c39af455c4dee53c6f3c918b0497f80a4fb0f21 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 25 Oct 2023 20:55:40 +0200 Subject: [PATCH] uitest oneprocess mode: default to this and clean up one test Now that all UITests either use gb_UITest_use_oneprocess or gb_UITest_avoid_oneprocess, it's possible to change the default to use oneprocess mode out of the box. Also clean up one test depend on this default. A later commit can clean up all other uses of gb_UITest_use_oneprocess, which is now redundant. Finally fix a typo in sw/UITest_sw_sidebar.mk. Change-Id: I6ae2ac5deb9c8ced9007c5b7da32743f9a2599ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158471 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- cui/UITest_cui_tabpages.mk | 2 -- solenv/gbuild/UITest.mk | 2 +- sw/UITest_sw_sidebar.mk | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cui/UITest_cui_tabpages.mk b/cui/UITest_cui_tabpages.mk index 61bcba9d1ca1..4458e9859e23 100644 --- a/cui/UITest_cui_tabpages.mk +++ b/cui/UITest_cui_tabpages.mk @@ -13,6 +13,4 @@ $(eval $(call gb_UITest_add_modules,cui_tabpages,$(SRCDIR)/cui/qa/uitest,\ tabpages/ \ )) -$(eval $(call gb_UITest_use_oneprocess,cui_tabpages)) - # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index cb7720f55b0c..648d1d4f62a1 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -106,7 +106,7 @@ $(call gb_UITest_get_target,$(1)) : MODULES := $(eval $(call gb_TestHelpers_use_more_fonts,$(call gb_UITest_get_target,$(1)))) $(eval $(call gb_Module_register_target,$(call gb_UITest_get_target,$(1)),$(call gb_UITest_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),UITest) -$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(false) +$(call gb_UITest_get_target,$(1)) : ONEPROCESS := $(true) endef diff --git a/sw/UITest_sw_sidebar.mk b/sw/UITest_sw_sidebar.mk index 3d73a4cf20ec..b395a206b969 100644 --- a/sw/UITest_sw_sidebar.mk +++ b/sw/UITest_sw_sidebar.mk @@ -15,6 +15,6 @@ $(eval $(call gb_UITest_set_defs,sw_sidebar, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) -$(eval $(call gb_UITest_avoid_oneprocess,sw_findReplace)) +$(eval $(call gb_UITest_avoid_oneprocess,sw_sidebar)) # vim: set noet sw=4 ts=4: