split sw unoapi test for performance

- test previously took 3m35s here
- slowest part is now 70s

Change-Id: I4a3e03cf6ef014ad60ecf6897b7395a680c33460
Reviewed-on: https://gerrit.libreoffice.org/15957Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

sw/JunitTest_sw_unoapi.mk → sw/JunitTest_sw_unoapi_1.mk

@@ -17,16 +17,16 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi_1))
 
-$(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
+$(eval $(call gb_JunitTest_set_defs,sw_unoapi_1,\
     $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sw/qa/unoapi/sw.sce \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sw/qa/unoapi/sw_1.sce \
     -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sw/qa/unoapi/knownissues.xcl \
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \
 ))
 
-$(eval $(call gb_JunitTest_use_jars,sw_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,sw_unoapi_1,\
     OOoRunner \
     ridl \
     test \
@@ -34,7 +34,7 @@ $(eval $(call gb_JunitTest_use_jars,sw_unoapi,\
     jurt \
 ))
 
-$(eval $(call gb_JunitTest_add_classes,sw_unoapi,\
+$(eval $(call gb_JunitTest_add_classes,sw_unoapi_1,\
     org.openoffice.test.UnoApiTest \
 ))
 

sw/JunitTest_sw_unoapi_2.mk

+# -*- 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/.
+#
+# 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 .
+#
+
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi_2))
+
+$(eval $(call gb_JunitTest_set_defs,sw_unoapi_2,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sw/qa/unoapi/sw_2.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sw/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,sw_unoapi_2,\
+    OOoRunner \
+    ridl \
+    test \
+    unoil \
+    jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sw_unoapi_2,\
+    org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:

sw/JunitTest_sw_unoapi_3.mk

+# -*- 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/.
+#
+# 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 .
+#
+
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi_3))
+
+$(eval $(call gb_JunitTest_set_defs,sw_unoapi_3,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sw/qa/unoapi/sw_3.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sw/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,sw_unoapi_3,\
+    OOoRunner \
+    ridl \
+    test \
+    unoil \
+    jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sw_unoapi_3,\
+    org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:

sw/JunitTest_sw_unoapi_4.mk

+# -*- 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/.
+#
+# 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 .
+#
+
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi_4))
+
+$(eval $(call gb_JunitTest_set_defs,sw_unoapi_4,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sw/qa/unoapi/sw_4.sce \
+    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sw/qa/unoapi/knownissues.xcl \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \
+))
+
+$(eval $(call gb_JunitTest_use_jars,sw_unoapi_4,\
+    OOoRunner \
+    ridl \
+    test \
+    unoil \
+    jurt \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sw_unoapi_4,\
+    org.openoffice.test.UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:

sw/Module_sw.mk

@@ -83,7 +83,10 @@ endif
 ifneq ($(OOO_JUNIT_JAR),)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
     JunitTest_sw_complex \
-    JunitTest_sw_unoapi \
+    JunitTest_sw_unoapi_1 \
+    JunitTest_sw_unoapi_2 \
+    JunitTest_sw_unoapi_3 \
+    JunitTest_sw_unoapi_4 \
 ))
 endif
 

sw/qa/unoapi/sw.sce → sw/qa/unoapi/sw_1.sce

@@ -45,68 +45,3 @@
 -o sw.SwXDocumentIndex
 -o sw.SwXDocumentIndexMark
 -o sw.SwXDocumentIndexes
--o sw.SwXDrawPage
--o sw.SwXEndnoteProperties
--o sw.SwXFieldEnumeration
--o sw.SwXFieldMaster
--o sw.SwXFootnote
--o sw.SwXFootnoteProperties
--o sw.SwXFootnoteText
--o sw.SwXFootnotes
--o sw.SwXFrames
--o sw.SwXHeadFootText
--o sw.SwXLineNumberingProperties
-#i85640 -o sw.SwXMailMerge
--o sw.SwXModule
--o sw.SwXNumberingRules
-#i103696 -o sw.SwXParagraph
--o sw.SwXParagraphEnumeration
--o sw.SwXPrintSettings
--o sw.SwXPropertySet
--o sw.SwXPropertySetInfo
--o sw.SwXReferenceMark
--o sw.SwXReferenceMarks
-#i111190 -o sw.SwXShape
--o sw.SwXStyleFamilies
--o sw.SwXStyleFamily
--o sw.SwXTableCellText
--o sw.SwXTableColumns
--o sw.SwXTableRows
--o sw.SwXTextColumns
--o sw.SwXTextCursor
-#i89021 -o sw.SwXTextDefaults
--o sw.SwXTextDocument
--o sw.SwXTextEmbeddedObject
--o sw.SwXTextEmbeddedObjects
--o sw.SwXTextField
--o sw.SwXTextFieldMasters
--o sw.SwXTextFieldTypes
--o sw.SwXTextFrame
--o sw.SwXTextFrameText
--o sw.SwXTextGraphicObject
--o sw.SwXTextGraphicObjects
-#i103696 -o sw.SwXTextPortion
--o sw.SwXTextPortionEnumeration
--o sw.SwXTextRange
--o sw.SwXTextRanges
--o sw.SwXTextSearch
--o sw.SwXTextSection
--o sw.SwXTextSections
--o sw.SwXTextTable
--o sw.SwXTextTableCursor
--o sw.SwXTextTableRow
--o sw.SwXTextTables
-#i85580 -o sw.SwXTextView
--o sw.SwXTextViewCursor
--o sw.SwXViewSettings
--o sw.XMLContentExporter
-#i23394 -o sw.XMLContentImporter
-#i111194-o sw.XMLExporter
--o sw.XMLImporter
-#i23394 -o sw.XMLMetaExporter
--o sw.XMLMetaImporter
--o sw.XMLSettingsExporter
--o sw.XMLSettingsImporter
--o sw.XMLStylesExporter
-#i23394 -o sw.XMLStylesImporter
--o sw.DocumentSettings

sw/qa/unoapi/sw_2.sce

+#
+# 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 sw.SwXDrawPage
+-o sw.SwXEndnoteProperties
+-o sw.SwXFieldEnumeration
+-o sw.SwXFieldMaster
+-o sw.SwXFootnote
+-o sw.SwXFootnoteProperties
+-o sw.SwXFootnoteText
+-o sw.SwXFootnotes
+-o sw.SwXFrames
+-o sw.SwXHeadFootText
+-o sw.SwXLineNumberingProperties
+#i85640 -o sw.SwXMailMerge
+-o sw.SwXModule
+-o sw.SwXNumberingRules
+#i103696 -o sw.SwXParagraph
+-o sw.SwXParagraphEnumeration
+-o sw.SwXPrintSettings
+-o sw.SwXPropertySet
+-o sw.SwXPropertySetInfo
+-o sw.SwXReferenceMark
+-o sw.SwXReferenceMarks
+#i111190 -o sw.SwXShape
+-o sw.SwXStyleFamilies
+-o sw.SwXStyleFamily
+-o sw.SwXTableCellText
+-o sw.SwXTableColumns
+-o sw.SwXTableRows

sw/qa/unoapi/sw_3.sce

+#
+# 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 sw.SwXTextColumns
+-o sw.SwXTextCursor
+#i89021 -o sw.SwXTextDefaults
+-o sw.SwXTextDocument
+-o sw.SwXTextEmbeddedObject
+-o sw.SwXTextEmbeddedObjects
+-o sw.SwXTextField
+-o sw.SwXTextFieldMasters
+-o sw.SwXTextFieldTypes
+-o sw.SwXTextFrame
+-o sw.SwXTextFrameText
+-o sw.SwXTextGraphicObject
+-o sw.SwXTextGraphicObjects
+#i103696 -o sw.SwXTextPortion
+-o sw.SwXTextPortionEnumeration
+-o sw.SwXTextRange
+-o sw.SwXTextRanges
+-o sw.SwXTextSearch
+-o sw.SwXTextSection
+-o sw.SwXTextSections

sw/qa/unoapi/sw_4.sce

+#
+# 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 sw.SwXTextTable
+-o sw.SwXTextTableCursor
+-o sw.SwXTextTableRow
+-o sw.SwXTextTables
+#i85580 -o sw.SwXTextView
+-o sw.SwXTextViewCursor
+-o sw.SwXViewSettings
+-o sw.XMLContentExporter
+#i23394 -o sw.XMLContentImporter
+#i111194-o sw.XMLExporter
+-o sw.XMLImporter
+#i23394 -o sw.XMLMetaExporter
+-o sw.XMLMetaImporter
+-o sw.XMLSettingsExporter
+-o sw.XMLSettingsImporter
+-o sw.XMLStylesExporter
+#i23394 -o sw.XMLStylesImporter
+-o sw.DocumentSettings