From 322044e128d86b1fd4a09c42f4950bf0f1cf4535 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 18 Oct 2023 20:06:36 +0200 Subject: [PATCH] uitest oneprocess mode: explicitly avoid this in the remaining tests These 11 suites depended on the UITest default to not use oneprocess mode. Explicitly avoid that mode in these suites, because they currently fail that way. This allows changing the default in the future, so new suites automatically benefit from the oneprocess mode (it runs faster, somewhat similar to cppunit). Change-Id: I8c493ca63310815c1364bb6182c3285a9c7fbd63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158128 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- sc/UITest_calc_tests7.mk | 2 ++ sc/UITest_calc_tests8.mk | 2 ++ sc/UITest_calc_tests9.mk | 2 ++ sc/UITest_search_replace.mk | 3 +++ sd/UITest_impress_tests.mk | 2 ++ sw/UITest_sw_findReplace.mk | 4 ++++ sw/UITest_sw_sidebar.mk | 4 ++++ sw/UITest_sw_table.mk | 4 ++++ sw/UITest_writer_macro_tests.mk | 4 ++++ sw/UITest_writer_tests.mk | 4 ++++ sw/UITest_writer_tests5.mk | 4 ++++ 11 files changed, 35 insertions(+) diff --git a/sc/UITest_calc_tests7.mk b/sc/UITest_calc_tests7.mk index b2e19b118ac0..8a6259c10550 100644 --- a/sc/UITest_calc_tests7.mk +++ b/sc/UITest_calc_tests7.mk @@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,calc_tests7, \ TDOC="$(SRCDIR)/sc/qa/uitest/data" \ )) +$(eval $(call gb_UITest_avoid_oneprocess,calc_tests7)) + # vim: set noet sw=4 ts=4: diff --git a/sc/UITest_calc_tests8.mk b/sc/UITest_calc_tests8.mk index 255dc2ec49d0..64167e45d0e7 100644 --- a/sc/UITest_calc_tests8.mk +++ b/sc/UITest_calc_tests8.mk @@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,calc_tests8, \ TDOC="$(SRCDIR)/sc/qa/uitest/data" \ )) +$(eval $(call gb_UITest_avoid_oneprocess,calc_tests8)) + # vim: set noet sw=4 ts=4: diff --git a/sc/UITest_calc_tests9.mk b/sc/UITest_calc_tests9.mk index bba170fdf80f..b84b25deb0de 100644 --- a/sc/UITest_calc_tests9.mk +++ b/sc/UITest_calc_tests9.mk @@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,calc_tests9, \ TDOC="$(SRCDIR)/sc/qa/uitest/data" \ )) +$(eval $(call gb_UITest_avoid_oneprocess,calc_tests9)) + # vim: set noet sw=4 ts=4: diff --git a/sc/UITest_search_replace.mk b/sc/UITest_search_replace.mk index 1400c8f27260..e737800cb4e8 100644 --- a/sc/UITest_search_replace.mk +++ b/sc/UITest_search_replace.mk @@ -16,4 +16,7 @@ $(eval $(call gb_UITest_add_modules,search_replace,$(SRCDIR)/sc/qa/uitest,\ $(eval $(call gb_UITest_set_defs,search_replace, \ TDOC="$(SRCDIR)/sc/qa/uitest/data/search_replace" \ )) + +$(eval $(call gb_UITest_avoid_oneprocess,search_replace)) + # vim: set noet sw=4 ts=4: diff --git a/sd/UITest_impress_tests.mk b/sd/UITest_impress_tests.mk index e1f6c47ff2c7..f2c074fe5246 100644 --- a/sd/UITest_impress_tests.mk +++ b/sd/UITest_impress_tests.mk @@ -15,4 +15,6 @@ $(eval $(call gb_UITest_set_defs,impress_tests, \ TDOC="$(SRCDIR)/sd/qa/uitest/data" \ )) +$(eval $(call gb_UITest_avoid_oneprocess,impress_tests)) + # vim: set noet sw=4 ts=4: diff --git a/sw/UITest_sw_findReplace.mk b/sw/UITest_sw_findReplace.mk index cfcf6e8218b5..72caa3cd9ed5 100644 --- a/sw/UITest_sw_findReplace.mk +++ b/sw/UITest_sw_findReplace.mk @@ -14,3 +14,7 @@ $(eval $(call gb_UITest_add_modules,sw_findReplace,$(SRCDIR)/sw/qa/uitest,\ $(eval $(call gb_UITest_set_defs,sw_findReplace, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) + +$(eval $(call gb_UITest_avoid_oneprocess,sw_findReplace)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/UITest_sw_sidebar.mk b/sw/UITest_sw_sidebar.mk index 8a087e14fa43..3d73a4cf20ec 100644 --- a/sw/UITest_sw_sidebar.mk +++ b/sw/UITest_sw_sidebar.mk @@ -14,3 +14,7 @@ $(eval $(call gb_UITest_add_modules,sw_sidebar,$(SRCDIR)/sw/qa/uitest,\ $(eval $(call gb_UITest_set_defs,sw_sidebar, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) + +$(eval $(call gb_UITest_avoid_oneprocess,sw_findReplace)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/UITest_sw_table.mk b/sw/UITest_sw_table.mk index ce4434ebfb0a..11d7f79a2983 100644 --- a/sw/UITest_sw_table.mk +++ b/sw/UITest_sw_table.mk @@ -14,3 +14,7 @@ $(eval $(call gb_UITest_add_modules,sw_table,$(SRCDIR)/sw/qa/uitest,\ $(eval $(call gb_UITest_set_defs,sw_table, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) + +$(eval $(call gb_UITest_avoid_oneprocess,sw_table)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/UITest_writer_macro_tests.mk b/sw/UITest_writer_macro_tests.mk index 4fddf1627338..01f58cd10f58 100644 --- a/sw/UITest_writer_macro_tests.mk +++ b/sw/UITest_writer_macro_tests.mk @@ -14,3 +14,7 @@ $(eval $(call gb_UITest_add_modules,writer_macro_tests,$(SRCDIR)/sw/qa/uitest,\ $(eval $(call gb_UITest_set_defs,writer_macro_tests, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) + +$(eval $(call gb_UITest_avoid_oneprocess,writer_macro_tests)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/UITest_writer_tests.mk b/sw/UITest_writer_tests.mk index 6ae91f00cc69..bda48fb229b1 100644 --- a/sw/UITest_writer_tests.mk +++ b/sw/UITest_writer_tests.mk @@ -14,3 +14,7 @@ $(eval $(call gb_UITest_add_modules,writer_tests,$(SRCDIR)/sw/qa/uitest,\ $(eval $(call gb_UITest_set_defs,writer_tests, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) + +$(eval $(call gb_UITest_avoid_oneprocess,writer_tests)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/UITest_writer_tests5.mk b/sw/UITest_writer_tests5.mk index 94bcdd13c1f0..47336dd98ba0 100644 --- a/sw/UITest_writer_tests5.mk +++ b/sw/UITest_writer_tests5.mk @@ -14,3 +14,7 @@ $(eval $(call gb_UITest_add_modules,writer_tests5,$(SRCDIR)/sw/qa/uitest,\ $(eval $(call gb_UITest_set_defs,writer_tests5, \ TDOC="$(SRCDIR)/sw/qa/uitest/data" \ )) + +$(eval $(call gb_UITest_avoid_oneprocess,writer_tests5)) + +# vim: set noet sw=4 ts=4: