From 5fe011ae025d7d354ca0647189524843a444ffba Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 29 May 2015 02:10:29 +0200 Subject: split forms unoapi test for performance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - test previously took 2m51s here - slowest part is now 54s Change-Id: Ib81fcb1a6e27dd54e0c3a319ff065166d57654ff Reviewed-on: https://gerrit.libreoffice.org/15959 Reviewed-by: Björn Michaelsen Tested-by: Björn Michaelsen --- forms/JunitTest_forms_unoapi.mk | 31 --------------------- forms/JunitTest_forms_unoapi_1.mk | 31 +++++++++++++++++++++ forms/JunitTest_forms_unoapi_2.mk | 31 +++++++++++++++++++++ forms/JunitTest_forms_unoapi_3.mk | 31 +++++++++++++++++++++ forms/JunitTest_forms_unoapi_4.mk | 31 +++++++++++++++++++++ forms/Module_forms.mk | 5 +++- forms/qa/unoapi/forms.sce | 57 --------------------------------------- forms/qa/unoapi/forms_1.sce | 27 +++++++++++++++++++ forms/qa/unoapi/forms_2.sce | 27 +++++++++++++++++++ forms/qa/unoapi/forms_3.sce | 27 +++++++++++++++++++ forms/qa/unoapi/forms_4.sce | 26 ++++++++++++++++++ 11 files changed, 235 insertions(+), 89 deletions(-) delete mode 100644 forms/JunitTest_forms_unoapi.mk create mode 100644 forms/JunitTest_forms_unoapi_1.mk create mode 100644 forms/JunitTest_forms_unoapi_2.mk create mode 100644 forms/JunitTest_forms_unoapi_3.mk create mode 100644 forms/JunitTest_forms_unoapi_4.mk delete mode 100644 forms/qa/unoapi/forms.sce create mode 100644 forms/qa/unoapi/forms_1.sce create mode 100644 forms/qa/unoapi/forms_2.sce create mode 100644 forms/qa/unoapi/forms_3.sce create mode 100644 forms/qa/unoapi/forms_4.sce (limited to 'forms') diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk deleted file mode 100644 index 3f74a74bf652..000000000000 --- a/forms/JunitTest_forms_unoapi.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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_JunitTest_JunitTest,forms_unoapi)) - -$(eval $(call gb_JunitTest_set_defs,forms_unoapi,\ - $$(DEFS) \ - -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms.sce \ - -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \ - -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \ -)) - -$(eval $(call gb_JunitTest_use_jars,forms_unoapi,\ - OOoRunner \ - ridl \ - test \ - unoil \ - jurt \ -)) - -$(eval $(call gb_JunitTest_add_classes,forms_unoapi,\ - org.openoffice.test.UnoApiTest \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/forms/JunitTest_forms_unoapi_1.mk b/forms/JunitTest_forms_unoapi_1.mk new file mode 100644 index 000000000000..766496355b63 --- /dev/null +++ b/forms/JunitTest_forms_unoapi_1.mk @@ -0,0 +1,31 @@ +# -*- 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_JunitTest_JunitTest,forms_unoapi_1)) + +$(eval $(call gb_JunitTest_set_defs,forms_unoapi_1,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_1.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_use_jars,forms_unoapi_1,\ + OOoRunner \ + ridl \ + test \ + unoil \ + jurt \ +)) + +$(eval $(call gb_JunitTest_add_classes,forms_unoapi_1,\ + org.openoffice.test.UnoApiTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/forms/JunitTest_forms_unoapi_2.mk b/forms/JunitTest_forms_unoapi_2.mk new file mode 100644 index 000000000000..c309cc75ebce --- /dev/null +++ b/forms/JunitTest_forms_unoapi_2.mk @@ -0,0 +1,31 @@ +# -*- 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_JunitTest_JunitTest,forms_unoapi_2)) + +$(eval $(call gb_JunitTest_set_defs,forms_unoapi_2,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_2.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_use_jars,forms_unoapi_2,\ + OOoRunner \ + ridl \ + test \ + unoil \ + jurt \ +)) + +$(eval $(call gb_JunitTest_add_classes,forms_unoapi_2,\ + org.openoffice.test.UnoApiTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/forms/JunitTest_forms_unoapi_3.mk b/forms/JunitTest_forms_unoapi_3.mk new file mode 100644 index 000000000000..4ba8829fddfa --- /dev/null +++ b/forms/JunitTest_forms_unoapi_3.mk @@ -0,0 +1,31 @@ +# -*- 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_JunitTest_JunitTest,forms_unoapi_3)) + +$(eval $(call gb_JunitTest_set_defs,forms_unoapi_3,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_3.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_use_jars,forms_unoapi_3,\ + OOoRunner \ + ridl \ + test \ + unoil \ + jurt \ +)) + +$(eval $(call gb_JunitTest_add_classes,forms_unoapi_3,\ + org.openoffice.test.UnoApiTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/forms/JunitTest_forms_unoapi_4.mk b/forms/JunitTest_forms_unoapi_4.mk new file mode 100644 index 000000000000..e63cc3ff069c --- /dev/null +++ b/forms/JunitTest_forms_unoapi_4.mk @@ -0,0 +1,31 @@ +# -*- 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_JunitTest_JunitTest,forms_unoapi_4)) + +$(eval $(call gb_JunitTest_set_defs,forms_unoapi_4,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_4.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_use_jars,forms_unoapi_4,\ + OOoRunner \ + ridl \ + test \ + unoil \ + jurt \ +)) + +$(eval $(call gb_JunitTest_add_classes,forms_unoapi_4,\ + org.openoffice.test.UnoApiTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index 45a6773e9d0f..266f6a3c2aec 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -18,7 +18,10 @@ $(eval $(call gb_Module_add_l10n_targets,forms,\ )) $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ - JunitTest_forms_unoapi \ + JunitTest_forms_unoapi_1 \ + JunitTest_forms_unoapi_2 \ + JunitTest_forms_unoapi_3 \ + JunitTest_forms_unoapi_4 \ JunitTest_forms_complex \ )) diff --git a/forms/qa/unoapi/forms.sce b/forms/qa/unoapi/forms.sce deleted file mode 100644 index a0264ba88a2a..000000000000 --- a/forms/qa/unoapi/forms.sce +++ /dev/null @@ -1,57 +0,0 @@ -# -# 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/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# --o forms.OButtonControl -#i111285 -o forms.OButtonModel --o forms.OCheckBoxControl --o forms.OCheckBoxModel --o forms.OComboBoxControl --o forms.OComboBoxModel --o forms.OCurrencyControl --o forms.OCurrencyModel -#-o forms.ODatabaseForm --o forms.ODateControl --o forms.ODateModel --o forms.OEditControl --o forms.OEditModel -#i109939 -o forms.OFileControlModel --o forms.OFixedTextModel --o forms.OFormattedControl -#i109939 -o forms.OFormattedFieldWrapper -# LäSST EIN DOKUMENT OFFEN -o forms.OFormsCollection --o forms.OGridControlModel --o forms.OGroupBoxControl --o forms.OGroupBoxModel --o forms.OHiddenModel --o forms.OImageButtonControl --o forms.OImageButtonModel --o forms.OImageControlControl --o forms.OImageControlModel -#i114669 -o forms.OListBoxControl --o forms.OListBoxModel --o forms.ONavigationBarControl --o forms.ONavigationBarModel --o forms.ONumericControl --o forms.ONumericModel --o forms.OPatternControl --o forms.OPatternModel --o forms.ORadioButtonControl --o forms.ORadioButtonModel --o forms.OScrollBarModel --o forms.OSpinButtonModel --o forms.OTimeControl --o forms.OTimeModel diff --git a/forms/qa/unoapi/forms_1.sce b/forms/qa/unoapi/forms_1.sce new file mode 100644 index 000000000000..d3d8df751256 --- /dev/null +++ b/forms/qa/unoapi/forms_1.sce @@ -0,0 +1,27 @@ +# +# 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +-o forms.OButtonControl +#i111285 -o forms.OButtonModel +-o forms.OCheckBoxControl +-o forms.OCheckBoxModel +-o forms.OComboBoxControl +-o forms.OComboBoxModel +-o forms.OCurrencyControl +-o forms.OCurrencyModel +#-o forms.ODatabaseForm +-o forms.ODateControl diff --git a/forms/qa/unoapi/forms_2.sce b/forms/qa/unoapi/forms_2.sce new file mode 100644 index 000000000000..102999ddc74c --- /dev/null +++ b/forms/qa/unoapi/forms_2.sce @@ -0,0 +1,27 @@ +# +# 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +-o forms.ODateModel +-o forms.OEditControl +-o forms.OEditModel +#i109939 -o forms.OFileControlModel +-o forms.OFixedTextModel +-o forms.OFormattedControl +#i109939 -o forms.OFormattedFieldWrapper +# LäSST EIN DOKUMENT OFFEN -o forms.OFormsCollection +-o forms.OGridControlModel +-o forms.OGroupBoxControl diff --git a/forms/qa/unoapi/forms_3.sce b/forms/qa/unoapi/forms_3.sce new file mode 100644 index 000000000000..e8b2754255d3 --- /dev/null +++ b/forms/qa/unoapi/forms_3.sce @@ -0,0 +1,27 @@ +# +# 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +-o forms.OHiddenModel +-o forms.OImageButtonControl +-o forms.OImageButtonModel +-o forms.OImageControlControl +-o forms.OImageControlModel +#i114669 -o forms.OListBoxControl +-o forms.OListBoxModel +-o forms.ONavigationBarControl +-o forms.ONavigationBarModel +-o forms.ONumericControl diff --git a/forms/qa/unoapi/forms_4.sce b/forms/qa/unoapi/forms_4.sce new file mode 100644 index 000000000000..b6bfbc1f5bd8 --- /dev/null +++ b/forms/qa/unoapi/forms_4.sce @@ -0,0 +1,26 @@ +# +# 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/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +-o forms.ONumericModel +-o forms.OPatternControl +-o forms.OPatternModel +-o forms.ORadioButtonControl +-o forms.ORadioButtonModel +-o forms.OScrollBarModel +-o forms.OSpinButtonModel +-o forms.OTimeControl +-o forms.OTimeModel -- cgit