[Libreoffice-commits] core.git: sc/Module_sc.mk sc/qa sc/UITest_calc_tests2.mk sc/UITest_calc_tests3.mk sc/UITest_calc_tests4.mk

Miklos Vajna vmiklos at collabora.co.uk
Fri Jun 1 14:00:53 UTC 2018 

 sc/Module_sc.mk          |    3 +++
 sc/UITest_calc_tests2.mk |   20 ++++++++++++++++++++
 sc/UITest_calc_tests3.mk |   20 ++++++++++++++++++++
 sc/UITest_calc_tests4.mk |   20 ++++++++++++++++++++
 4 files changed, 63 insertions(+)

New commits:
commit 94dcb3b1a5b38b7b35cb75b068836d78134a6b7b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jun 1 12:46:30 2018 +0200

    UITest_calc_tests: split this into 4 parts
    
    Before: make -sr UITest_calc_tests -> 10m48.934s
    
    After: make -sr -j4 UITest_calc_tests UITest_calc_tests2 UITest_calc_tests3 UITest_calc_tests4 -> 5m40.113s
    
    As a start just split based on the number of .py files in the
    directories, one could improve this further by making them even more
    equal based on number of lines or something.
    
    Change-Id: I7a98a29e5d18a7600575956a7d8a0ec81e804269
    Reviewed-on: https://gerrit.libreoffice.org/55174
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 35277496202a..ee30a84469e5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -185,6 +185,9 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
 	UITest_autofilter \
 	UITest_search_replace \
 	UITest_calc_tests \
+	UITest_calc_tests2 \
+	UITest_calc_tests3 \
+	UITest_calc_tests4 \
 ))
 endif
 
diff --git a/sc/UITest_calc_tests2.mk b/sc/UITest_calc_tests2.mk
new file mode 100644
index 000000000000..509224823e94
--- /dev/null
+++ b/sc/UITest_calc_tests2.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,calc_tests2))
+
+$(eval $(call gb_UITest_add_modules,calc_tests2,$(SRCDIR)/sc/qa/uitest,\
+	calc_tests2/ \
+))
+
+$(eval $(call gb_UITest_set_defs,calc_tests2, \
+    TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests3.mk b/sc/UITest_calc_tests3.mk
new file mode 100644
index 000000000000..957f133c7798
--- /dev/null
+++ b/sc/UITest_calc_tests3.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,calc_tests3))
+
+$(eval $(call gb_UITest_add_modules,calc_tests3,$(SRCDIR)/sc/qa/uitest,\
+	calc_tests3/ \
+))
+
+$(eval $(call gb_UITest_set_defs,calc_tests3, \
+    TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_calc_tests4.mk b/sc/UITest_calc_tests4.mk
new file mode 100644
index 000000000000..dd78440272a3
--- /dev/null
+++ b/sc/UITest_calc_tests4.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,calc_tests4))
+
+$(eval $(call gb_UITest_add_modules,calc_tests4,$(SRCDIR)/sc/qa/uitest,\
+	calc_tests4/ \
+))
+
+$(eval $(call gb_UITest_set_defs,calc_tests4, \
+    TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/calc_tests/stableSorting.py b/sc/qa/uitest/calc_tests2/stableSorting.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/stableSorting.py
rename to sc/qa/uitest/calc_tests2/stableSorting.py
diff --git a/sc/qa/uitest/calc_tests/standardFilter.py b/sc/qa/uitest/calc_tests2/standardFilter.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/standardFilter.py
rename to sc/qa/uitest/calc_tests2/standardFilter.py
diff --git a/sc/qa/uitest/calc_tests/subtotals.py b/sc/qa/uitest/calc_tests2/subtotals.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/subtotals.py
rename to sc/qa/uitest/calc_tests2/subtotals.py
diff --git a/sc/qa/uitest/calc_tests/tdf104117.py b/sc/qa/uitest/calc_tests2/tdf104117.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf104117.py
rename to sc/qa/uitest/calc_tests2/tdf104117.py
diff --git a/sc/qa/uitest/calc_tests/tdf105268.py b/sc/qa/uitest/calc_tests2/tdf105268.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf105268.py
rename to sc/qa/uitest/calc_tests2/tdf105268.py
diff --git a/sc/qa/uitest/calc_tests/tdf114992.py b/sc/qa/uitest/calc_tests2/tdf114992.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf114992.py
rename to sc/qa/uitest/calc_tests2/tdf114992.py
diff --git a/sc/qa/uitest/calc_tests/tdf116215.py b/sc/qa/uitest/calc_tests2/tdf116215.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf116215.py
rename to sc/qa/uitest/calc_tests2/tdf116215.py
diff --git a/sc/qa/uitest/calc_tests/tdf116421.py b/sc/qa/uitest/calc_tests2/tdf116421.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf116421.py
rename to sc/qa/uitest/calc_tests2/tdf116421.py
diff --git a/sc/qa/uitest/calc_tests/tdf117367.py b/sc/qa/uitest/calc_tests2/tdf117367.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf117367.py
rename to sc/qa/uitest/calc_tests2/tdf117367.py
diff --git a/sc/qa/uitest/calc_tests/tdf37623.py b/sc/qa/uitest/calc_tests2/tdf37623.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf37623.py
rename to sc/qa/uitest/calc_tests2/tdf37623.py
diff --git a/sc/qa/uitest/calc_tests/tdf46138.py b/sc/qa/uitest/calc_tests2/tdf46138.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf46138.py
rename to sc/qa/uitest/calc_tests2/tdf46138.py
diff --git a/sc/qa/uitest/calc_tests/tdf51700.py b/sc/qa/uitest/calc_tests2/tdf51700.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf51700.py
rename to sc/qa/uitest/calc_tests2/tdf51700.py
diff --git a/sc/qa/uitest/calc_tests/tdf53482.py b/sc/qa/uitest/calc_tests2/tdf53482.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf53482.py
rename to sc/qa/uitest/calc_tests2/tdf53482.py
diff --git a/sc/qa/uitest/calc_tests/tdf54018.py b/sc/qa/uitest/calc_tests2/tdf54018.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf54018.py
rename to sc/qa/uitest/calc_tests2/tdf54018.py
diff --git a/sc/qa/uitest/calc_tests/tdf57274.py b/sc/qa/uitest/calc_tests3/tdf57274.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf57274.py
rename to sc/qa/uitest/calc_tests3/tdf57274.py
diff --git a/sc/qa/uitest/calc_tests/tdf62267.py b/sc/qa/uitest/calc_tests3/tdf62267.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf62267.py
rename to sc/qa/uitest/calc_tests3/tdf62267.py
diff --git a/sc/qa/uitest/calc_tests/tdf63805.py b/sc/qa/uitest/calc_tests3/tdf63805.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf63805.py
rename to sc/qa/uitest/calc_tests3/tdf63805.py
diff --git a/sc/qa/uitest/calc_tests/tdf64001.py b/sc/qa/uitest/calc_tests3/tdf64001.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf64001.py
rename to sc/qa/uitest/calc_tests3/tdf64001.py
diff --git a/sc/qa/uitest/calc_tests/tdf65856.py b/sc/qa/uitest/calc_tests3/tdf65856.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf65856.py
rename to sc/qa/uitest/calc_tests3/tdf65856.py
diff --git a/sc/qa/uitest/calc_tests/tdf68290.py b/sc/qa/uitest/calc_tests3/tdf68290.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf68290.py
rename to sc/qa/uitest/calc_tests3/tdf68290.py
diff --git a/sc/qa/uitest/calc_tests/tdf69450.py b/sc/qa/uitest/calc_tests3/tdf69450.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf69450.py
rename to sc/qa/uitest/calc_tests3/tdf69450.py
diff --git a/sc/qa/uitest/calc_tests/tdf69981.py b/sc/qa/uitest/calc_tests3/tdf69981.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf69981.py
rename to sc/qa/uitest/calc_tests3/tdf69981.py
diff --git a/sc/qa/uitest/calc_tests/tdf71339.py b/sc/qa/uitest/calc_tests3/tdf71339.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf71339.py
rename to sc/qa/uitest/calc_tests3/tdf71339.py
diff --git a/sc/qa/uitest/calc_tests/tdf73006.py b/sc/qa/uitest/calc_tests3/tdf73006.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf73006.py
rename to sc/qa/uitest/calc_tests3/tdf73006.py
diff --git a/sc/qa/uitest/calc_tests/tdf79983.py b/sc/qa/uitest/calc_tests3/tdf79983.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf79983.py
rename to sc/qa/uitest/calc_tests3/tdf79983.py
diff --git a/sc/qa/uitest/calc_tests/tdf80693.py b/sc/qa/uitest/calc_tests3/tdf80693.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf80693.py
rename to sc/qa/uitest/calc_tests3/tdf80693.py
diff --git a/sc/qa/uitest/calc_tests/tdf81351.py b/sc/qa/uitest/calc_tests3/tdf81351.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf81351.py
rename to sc/qa/uitest/calc_tests3/tdf81351.py
diff --git a/sc/qa/uitest/calc_tests/tdf82398.py b/sc/qa/uitest/calc_tests3/tdf82398.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf82398.py
rename to sc/qa/uitest/calc_tests3/tdf82398.py
diff --git a/sc/qa/uitest/calc_tests/tdf85403.py b/sc/qa/uitest/calc_tests4/tdf85403.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf85403.py
rename to sc/qa/uitest/calc_tests4/tdf85403.py
diff --git a/sc/qa/uitest/calc_tests/tdf85979.py b/sc/qa/uitest/calc_tests4/tdf85979.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf85979.py
rename to sc/qa/uitest/calc_tests4/tdf85979.py
diff --git a/sc/qa/uitest/calc_tests/tdf86253.py b/sc/qa/uitest/calc_tests4/tdf86253.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf86253.py
rename to sc/qa/uitest/calc_tests4/tdf86253.py
diff --git a/sc/qa/uitest/calc_tests/tdf88999.py b/sc/qa/uitest/calc_tests4/tdf88999.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf88999.py
rename to sc/qa/uitest/calc_tests4/tdf88999.py
diff --git a/sc/qa/uitest/calc_tests/tdf89907.py b/sc/qa/uitest/calc_tests4/tdf89907.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf89907.py
rename to sc/qa/uitest/calc_tests4/tdf89907.py
diff --git a/sc/qa/uitest/calc_tests/tdf89958.py b/sc/qa/uitest/calc_tests4/tdf89958.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf89958.py
rename to sc/qa/uitest/calc_tests4/tdf89958.py
diff --git a/sc/qa/uitest/calc_tests/tdf91305.py b/sc/qa/uitest/calc_tests4/tdf91305.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf91305.py
rename to sc/qa/uitest/calc_tests4/tdf91305.py
diff --git a/sc/qa/uitest/calc_tests/tdf92423.py b/sc/qa/uitest/calc_tests4/tdf92423.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf92423.py
rename to sc/qa/uitest/calc_tests4/tdf92423.py
diff --git a/sc/qa/uitest/calc_tests/tdf94208.py b/sc/qa/uitest/calc_tests4/tdf94208.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf94208.py
rename to sc/qa/uitest/calc_tests4/tdf94208.py
diff --git a/sc/qa/uitest/calc_tests/tdf95192.py b/sc/qa/uitest/calc_tests4/tdf95192.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf95192.py
rename to sc/qa/uitest/calc_tests4/tdf95192.py
diff --git a/sc/qa/uitest/calc_tests/tdf99208.py b/sc/qa/uitest/calc_tests4/tdf99208.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf99208.py
rename to sc/qa/uitest/calc_tests4/tdf99208.py
diff --git a/sc/qa/uitest/calc_tests/tdf99386.py b/sc/qa/uitest/calc_tests4/tdf99386.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf99386.py
rename to sc/qa/uitest/calc_tests4/tdf99386.py
diff --git a/sc/qa/uitest/calc_tests/tdf99627.py b/sc/qa/uitest/calc_tests4/tdf99627.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf99627.py
rename to sc/qa/uitest/calc_tests4/tdf99627.py
diff --git a/sc/qa/uitest/calc_tests/tdf99773.py b/sc/qa/uitest/calc_tests4/tdf99773.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/tdf99773.py
rename to sc/qa/uitest/calc_tests4/tdf99773.py
diff --git a/sc/qa/uitest/calc_tests/textToColumns.py b/sc/qa/uitest/calc_tests4/textToColumns.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/textToColumns.py
rename to sc/qa/uitest/calc_tests4/textToColumns.py
diff --git a/sc/qa/uitest/calc_tests/trackedChanges.py b/sc/qa/uitest/calc_tests4/trackedChanges.py
similarity index 100%
rename from sc/qa/uitest/calc_tests/trackedChanges.py
rename to sc/qa/uitest/calc_tests4/trackedChanges.py

More information about the Libreoffice-commits mailing list