diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-03-02 15:42:21 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-03-03 07:57:24 +0100 |
commit | 62b92a8973db0ecb1942a80d50b2c532b5d4d2f9 (patch) | |
tree | 8d4c5d5b94a53c47c8340bb1a2a1108373087b1f /uitest | |
parent | 198685ded79d64b21023ee85e9a15fa1b32705a0 (diff) |
uitest: split up UITest_writer_demo
I used solenv/gbuild/Trace.mk to measure where the time is spent at the
end of an incremental 'make check'. The last 141 seconds is spent
executing UITest_writer_demo alone.
If that test is executed in isolation, it takes 289 seconds. I measured
the cost of all the individual .py suites and arranged them into 8
separate UITests, this way the make -j8 cost is 101 seconds (i.e. 35% of
the baseline). IOW this is supposed to speed up 'make check' with 3m13s,
provided you have the code already built.
Change-Id: I1ffee3a06b8fd84d7b9a0295547900df11f11f68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89835
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'uitest')
-rw-r--r-- | uitest/Module_uitest.mk | 9 | ||||
-rw-r--r-- | uitest/UITest_writer_demo1.mk (renamed from uitest/UITest_writer_demo.mk) | 8 | ||||
-rw-r--r-- | uitest/UITest_writer_demo2.mk | 20 | ||||
-rw-r--r-- | uitest/UITest_writer_demo3.mk | 20 | ||||
-rw-r--r-- | uitest/UITest_writer_demo4.mk | 20 | ||||
-rw-r--r-- | uitest/UITest_writer_demo5.mk | 20 | ||||
-rw-r--r-- | uitest/UITest_writer_demo6.mk | 20 | ||||
-rw-r--r-- | uitest/UITest_writer_demo7.mk | 20 | ||||
-rw-r--r-- | uitest/UITest_writer_demo8.mk | 20 | ||||
-rw-r--r-- | uitest/writer_tests1/pageDialog.py (renamed from uitest/writer_tests/pageDialog.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests2/tdf92611.py (renamed from uitest/writer_tests/tdf92611.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests3/tdf104649.py (renamed from uitest/writer_tests/tdf104649.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests4/insertTableDialog.py (renamed from uitest/writer_tests/insertTableDialog.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests4/start.py (renamed from uitest/writer_tests/start.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests5/spellDialog.py (renamed from uitest/writer_tests/spellDialog.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests5/tdf114724.py (renamed from uitest/writer_tests/tdf114724.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests6/insertBreakDialog.py (renamed from uitest/writer_tests/insertBreakDialog.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests6/insertPageHeader.py (renamed from uitest/writer_tests/insertPageHeader.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests7/autoredactDialog.py (renamed from uitest/writer_tests/autoredactDialog.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests7/goToPage.py (renamed from uitest/writer_tests/goToPage.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests8/customizeDialog.py (renamed from uitest/writer_tests/customizeDialog.py) | 0 | ||||
-rw-r--r-- | uitest/writer_tests8/tdf79236.py (renamed from uitest/writer_tests/tdf79236.py) | 0 |
22 files changed, 152 insertions, 5 deletions
diff --git a/uitest/Module_uitest.mk b/uitest/Module_uitest.mk index fb82005a0468..bd65a088e301 100644 --- a/uitest/Module_uitest.mk +++ b/uitest/Module_uitest.mk @@ -12,7 +12,14 @@ $(eval $(call gb_Module_Module,uitest)) $(eval $(call gb_Module_add_uicheck_targets,uitest,\ UITest_calc_demo \ - UITest_writer_demo \ + UITest_writer_demo1 \ + UITest_writer_demo2 \ + UITest_writer_demo3 \ + UITest_writer_demo4 \ + UITest_writer_demo5 \ + UITest_writer_demo6 \ + UITest_writer_demo7 \ + UITest_writer_demo8 \ UITest_impress_demo \ UITest_demo_ui \ UITest_math_demo \ diff --git a/uitest/UITest_writer_demo.mk b/uitest/UITest_writer_demo1.mk index 51b12feda607..e951e4ad2b9d 100644 --- a/uitest/UITest_writer_demo.mk +++ b/uitest/UITest_writer_demo1.mk @@ -7,13 +7,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UITest_UITest,writer_demo)) +$(eval $(call gb_UITest_UITest,writer_demo1)) -$(eval $(call gb_UITest_add_modules,writer_demo,$(SRCDIR)/uitest,\ - writer_tests/ \ +$(eval $(call gb_UITest_add_modules,writer_demo1,$(SRCDIR)/uitest,\ + writer_tests1/ \ )) -$(eval $(call gb_UITest_set_defs,writer_demo, \ +$(eval $(call gb_UITest_set_defs,writer_demo1, \ TDOC="$(SRCDIR)/uitest/writer_tests/data" \ )) diff --git a/uitest/UITest_writer_demo2.mk b/uitest/UITest_writer_demo2.mk new file mode 100644 index 000000000000..6f74f97ab75a --- /dev/null +++ b/uitest/UITest_writer_demo2.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,writer_demo2)) + +$(eval $(call gb_UITest_add_modules,writer_demo2,$(SRCDIR)/uitest,\ + writer_tests2/ \ +)) + +$(eval $(call gb_UITest_set_defs,writer_demo2, \ + TDOC="$(SRCDIR)/uitest/writer_tests/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/uitest/UITest_writer_demo3.mk b/uitest/UITest_writer_demo3.mk new file mode 100644 index 000000000000..9f6302670493 --- /dev/null +++ b/uitest/UITest_writer_demo3.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,writer_demo3)) + +$(eval $(call gb_UITest_add_modules,writer_demo3,$(SRCDIR)/uitest,\ + writer_tests3/ \ +)) + +$(eval $(call gb_UITest_set_defs,writer_demo3, \ + TDOC="$(SRCDIR)/uitest/writer_tests/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/uitest/UITest_writer_demo4.mk b/uitest/UITest_writer_demo4.mk new file mode 100644 index 000000000000..5ad99203efd5 --- /dev/null +++ b/uitest/UITest_writer_demo4.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,writer_demo4)) + +$(eval $(call gb_UITest_add_modules,writer_demo4,$(SRCDIR)/uitest,\ + writer_tests4/ \ +)) + +$(eval $(call gb_UITest_set_defs,writer_demo4, \ + TDOC="$(SRCDIR)/uitest/writer_tests/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/uitest/UITest_writer_demo5.mk b/uitest/UITest_writer_demo5.mk new file mode 100644 index 000000000000..1f44c66660e8 --- /dev/null +++ b/uitest/UITest_writer_demo5.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,writer_demo5)) + +$(eval $(call gb_UITest_add_modules,writer_demo5,$(SRCDIR)/uitest,\ + writer_tests5/ \ +)) + +$(eval $(call gb_UITest_set_defs,writer_demo5, \ + TDOC="$(SRCDIR)/uitest/writer_tests/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/uitest/UITest_writer_demo6.mk b/uitest/UITest_writer_demo6.mk new file mode 100644 index 000000000000..9c1e040a0d24 --- /dev/null +++ b/uitest/UITest_writer_demo6.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,writer_demo6)) + +$(eval $(call gb_UITest_add_modules,writer_demo6,$(SRCDIR)/uitest,\ + writer_tests6/ \ +)) + +$(eval $(call gb_UITest_set_defs,writer_demo6, \ + TDOC="$(SRCDIR)/uitest/writer_tests/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/uitest/UITest_writer_demo7.mk b/uitest/UITest_writer_demo7.mk new file mode 100644 index 000000000000..10fc45008562 --- /dev/null +++ b/uitest/UITest_writer_demo7.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,writer_demo7)) + +$(eval $(call gb_UITest_add_modules,writer_demo7,$(SRCDIR)/uitest,\ + writer_tests7/ \ +)) + +$(eval $(call gb_UITest_set_defs,writer_demo7, \ + TDOC="$(SRCDIR)/uitest/writer_tests/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/uitest/UITest_writer_demo8.mk b/uitest/UITest_writer_demo8.mk new file mode 100644 index 000000000000..7c9eabceb9bf --- /dev/null +++ b/uitest/UITest_writer_demo8.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_UITest_UITest,writer_demo8)) + +$(eval $(call gb_UITest_add_modules,writer_demo8,$(SRCDIR)/uitest,\ + writer_tests8/ \ +)) + +$(eval $(call gb_UITest_set_defs,writer_demo8, \ + TDOC="$(SRCDIR)/uitest/writer_tests/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/uitest/writer_tests/pageDialog.py b/uitest/writer_tests1/pageDialog.py index 233c269d891f..233c269d891f 100644 --- a/uitest/writer_tests/pageDialog.py +++ b/uitest/writer_tests1/pageDialog.py diff --git a/uitest/writer_tests/tdf92611.py b/uitest/writer_tests2/tdf92611.py index 0b6007bfeb6d..0b6007bfeb6d 100644 --- a/uitest/writer_tests/tdf92611.py +++ b/uitest/writer_tests2/tdf92611.py diff --git a/uitest/writer_tests/tdf104649.py b/uitest/writer_tests3/tdf104649.py index f6541feee5a4..f6541feee5a4 100644 --- a/uitest/writer_tests/tdf104649.py +++ b/uitest/writer_tests3/tdf104649.py diff --git a/uitest/writer_tests/insertTableDialog.py b/uitest/writer_tests4/insertTableDialog.py index 60d427954a4c..60d427954a4c 100644 --- a/uitest/writer_tests/insertTableDialog.py +++ b/uitest/writer_tests4/insertTableDialog.py diff --git a/uitest/writer_tests/start.py b/uitest/writer_tests4/start.py index 5851e8eff7c9..5851e8eff7c9 100644 --- a/uitest/writer_tests/start.py +++ b/uitest/writer_tests4/start.py diff --git a/uitest/writer_tests/spellDialog.py b/uitest/writer_tests5/spellDialog.py index e678afea53e9..e678afea53e9 100644 --- a/uitest/writer_tests/spellDialog.py +++ b/uitest/writer_tests5/spellDialog.py diff --git a/uitest/writer_tests/tdf114724.py b/uitest/writer_tests5/tdf114724.py index 8d67f2a95bff..8d67f2a95bff 100644 --- a/uitest/writer_tests/tdf114724.py +++ b/uitest/writer_tests5/tdf114724.py diff --git a/uitest/writer_tests/insertBreakDialog.py b/uitest/writer_tests6/insertBreakDialog.py index 291ffdac53b4..291ffdac53b4 100644 --- a/uitest/writer_tests/insertBreakDialog.py +++ b/uitest/writer_tests6/insertBreakDialog.py diff --git a/uitest/writer_tests/insertPageHeader.py b/uitest/writer_tests6/insertPageHeader.py index 245073ace5a5..245073ace5a5 100644 --- a/uitest/writer_tests/insertPageHeader.py +++ b/uitest/writer_tests6/insertPageHeader.py diff --git a/uitest/writer_tests/autoredactDialog.py b/uitest/writer_tests7/autoredactDialog.py index 015081431d7a..015081431d7a 100644 --- a/uitest/writer_tests/autoredactDialog.py +++ b/uitest/writer_tests7/autoredactDialog.py diff --git a/uitest/writer_tests/goToPage.py b/uitest/writer_tests7/goToPage.py index d20f042dfb9a..d20f042dfb9a 100644 --- a/uitest/writer_tests/goToPage.py +++ b/uitest/writer_tests7/goToPage.py diff --git a/uitest/writer_tests/customizeDialog.py b/uitest/writer_tests8/customizeDialog.py index fa187c36ac35..fa187c36ac35 100644 --- a/uitest/writer_tests/customizeDialog.py +++ b/uitest/writer_tests8/customizeDialog.py diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests8/tdf79236.py index 8585e48d8c64..8585e48d8c64 100644 --- a/uitest/writer_tests/tdf79236.py +++ b/uitest/writer_tests8/tdf79236.py |