bin/count-slow-uitests | 20 ++++++++++++++++++++ sc/UITest_calc_tests6.mk | 2 ++ sc/UITest_chart.mk | 2 ++ sc/UITest_chart2.mk | 2 ++ sc/UITest_sort.mk | 2 ++ sw/inc/strings.hrc | 1 + sw/inc/swundo.hxx | 1 + sw/source/core/undo/undobj.cxx | 3 +++ sw/source/uibase/shells/basesh.cxx | 4 ++-- 9 files changed, 35 insertions(+), 2 deletions(-)
New commits: commit 3ec17b23098eed2934020995a890740e7f8581cc Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Wed Mar 29 23:19:19 2023 +0100 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Thu Mar 30 06:54:54 2023 +0000 UITest_{calc_tests6,chart,chart2,sort}: enable oneprocess mode Execution time changes: - from 1m27,535s to 0m55,724s - from 5m40,926s to 4m46,884s - from 1m54,886s to 1m31,400s - from 3m30,592s to 2m20,833s for me. Also add a simple script that lists what's remaining to be converted. Change-Id: I274f5a11a0f606964bdad5d5e5254b65b09fe497 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149739 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/bin/count-slow-uitests b/bin/count-slow-uitests new file mode 100755 index 000000000000..8895c2013667 --- /dev/null +++ b/bin/count-slow-uitests @@ -0,0 +1,20 @@ +#!/bin/sh +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Run this from the source root dir to count the number of non-oneprocess ui tests + +for i in */UITest_*.mk +do + if grep -q oneprocess $i; then + continue + fi + + echo $i +done + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sc/UITest_calc_tests6.mk b/sc/UITest_calc_tests6.mk index aebee3bceb3d..715f1befff49 100644 --- a/sc/UITest_calc_tests6.mk +++ b/sc/UITest_calc_tests6.mk @@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,calc_tests6, \ TDOC="$(SRCDIR)/sc/qa/uitest/data" \ )) +$(eval $(call gb_UITest_use_oneprocess,calc_tests6)) + # vim: set noet sw=4 ts=4: diff --git a/sc/UITest_chart.mk b/sc/UITest_chart.mk index 18f77a3fcc83..003c9a322b72 100644 --- a/sc/UITest_chart.mk +++ b/sc/UITest_chart.mk @@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,chart, \ TDOC="$(SRCDIR)/sc/qa/uitest/data" \ )) +$(eval $(call gb_UITest_use_oneprocess,chart)) + # vim: set noet sw=4 ts=4: diff --git a/sc/UITest_chart2.mk b/sc/UITest_chart2.mk index 1d60c1dd06ce..294b4603088b 100644 --- a/sc/UITest_chart2.mk +++ b/sc/UITest_chart2.mk @@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,chart2, \ TDOC="$(SRCDIR)/sc/qa/uitest/data" \ )) +$(eval $(call gb_UITest_use_oneprocess,chart2)) + # vim: set noet sw=4 ts=4: diff --git a/sc/UITest_sort.mk b/sc/UITest_sort.mk index 55b4cec6910f..0dced609fece 100644 --- a/sc/UITest_sort.mk +++ b/sc/UITest_sort.mk @@ -17,4 +17,6 @@ $(eval $(call gb_UITest_set_defs,sort, \ TDOC="$(SRCDIR)/sc/qa/uitest/data" \ )) +$(eval $(call gb_UITest_use_oneprocess,sort)) + # vim: set noet sw=4 ts=4: commit d3bfbcb5f42ca0ff3441ee14b179ca590e646b1f Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Wed Mar 29 22:38:01 2023 +0100 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Thu Mar 30 06:54:39 2023 +0000 sw: fix undo comment of FN_UPDATE_FIELDS It's updates, not insert. One has to dispatch .uno:UpdateFields to see this in action, which does something if the document already has exiting reference marks. Change-Id: If5a06d2a81aa2439977c9fc51c3af1ee241f9eb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149738 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc index a7e7c88af83a..c76d9fca2042 100644 --- a/sw/inc/strings.hrc +++ b/sw/inc/strings.hrc @@ -442,6 +442,7 @@ #define STR_UPDATE_BOOKMARK NC_("STR_UPDATE_BOOKMARK", "Update bookmark: $1") #define STR_UPDATE_BOOKMARKS NC_("STR_UPDATE_BOOKMARKS", "Update bookmarks") #define STR_UPDATE_FIELD NC_("STR_UPDATE_FIELD", "Update field: $1") +#define STR_UPDATE_FIELDS NC_("STR_UPDATE_FIELDS", "Update fields") #define STR_SORT_TBL NC_("STR_SORT_TBL", "Sort table") #define STR_SORT_TXT NC_("STR_SORT_TXT", "Sort text") #define STR_INSTABLE_UNDO NC_("STR_INSTABLE_UNDO", "Insert table: $1$2$3") diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index ff806d430330..105991347fdb 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -174,6 +174,7 @@ enum class SwUndoId UPDATE_BOOKMARKS, // 142 DELETE_BOOKMARKS, // 143 UPDATE_FIELD, // 144 + UPDATE_FIELDS, // 145 }; OUString GetUndoComment(SwUndoId eId); diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 42f71be7c327..27a637616608 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -667,6 +667,9 @@ OUString GetUndoComment(SwUndoId eId) case SwUndoId::UPDATE_FIELD: pId = STR_UPDATE_FIELD; break; + case SwUndoId::UPDATE_FIELDS: + pId = STR_UPDATE_FIELDS; + break; } assert(pId); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 54745cdd1a48..07a44e6d78be 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -802,7 +802,7 @@ bool UpdateFieldContents(SfxRequest& rReq, SwWrtShell& rWrtSh) pFields->GetValue() >>= aFields; SwDoc* pDoc = rWrtSh.GetDoc(); - pDoc->GetIDocumentUndoRedo().StartUndo(SwUndoId::INSBOOKMARK, nullptr); + pDoc->GetIDocumentUndoRedo().StartUndo(SwUndoId::UPDATE_FIELDS, nullptr); rWrtSh.StartAction(); std::vector<const SwFormatRefMark*> aRefMarks; @@ -882,7 +882,7 @@ bool UpdateFieldContents(SfxRequest& rReq, SwWrtShell& rWrtSh) } rWrtSh.EndAction(); - pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::INSBOOKMARK, nullptr); + pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::UPDATE_FIELDS, nullptr); return true; }