[Libreoffice-commits] core.git: sw/JunitTest_sw_unoapi_1.mk sw/JunitTest_sw_unoapi_2.mk sw/JunitTest_sw_unoapi_3.mk sw/JunitTest_sw_unoapi_4.mk sw/JunitTest_sw_unoapi.mk sw/Module_sw.mk sw/qa
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Fri May 29 04:52:16 PDT 2015
sw/JunitTest_sw_unoapi.mk | 41 ----------------
sw/JunitTest_sw_unoapi_1.mk | 41 ++++++++++++++++
sw/JunitTest_sw_unoapi_2.mk | 41 ++++++++++++++++
sw/JunitTest_sw_unoapi_3.mk | 41 ++++++++++++++++
sw/JunitTest_sw_unoapi_4.mk | 41 ++++++++++++++++
sw/Module_sw.mk | 5 +
sw/qa/unoapi/sw.sce | 112 --------------------------------------------
sw/qa/unoapi/sw_1.sce | 47 ++++++++++++++++++
sw/qa/unoapi/sw_2.sce | 45 +++++++++++++++++
sw/qa/unoapi/sw_3.sce | 37 ++++++++++++++
sw/qa/unoapi/sw_4.sce | 35 +++++++++++++
11 files changed, 332 insertions(+), 154 deletions(-)
New commits:
commit e68cc3f919c85a385fb3d8f073fbd5cd04ab835f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri May 29 01:31:59 2015 +0200
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/15957
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi_1.mk
similarity index 81%
rename from sw/JunitTest_sw_unoapi.mk
rename to sw/JunitTest_sw_unoapi_1.mk
index df05e59..8861a5ea 100644
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/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 \
))
diff --git a/sw/JunitTest_sw_unoapi_2.mk b/sw/JunitTest_sw_unoapi_2.mk
new file mode 100644
index 0000000..502c2e8
--- /dev/null
+++ b/sw/JunitTest_sw_unoapi_2.mk
@@ -0,0 +1,41 @@
+# -*- 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:
diff --git a/sw/JunitTest_sw_unoapi_3.mk b/sw/JunitTest_sw_unoapi_3.mk
new file mode 100644
index 0000000..f7bb8ba
--- /dev/null
+++ b/sw/JunitTest_sw_unoapi_3.mk
@@ -0,0 +1,41 @@
+# -*- 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:
diff --git a/sw/JunitTest_sw_unoapi_4.mk b/sw/JunitTest_sw_unoapi_4.mk
new file mode 100644
index 0000000..91a3f12
--- /dev/null
+++ b/sw/JunitTest_sw_unoapi_4.mk
@@ -0,0 +1,41 @@
+# -*- 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:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index ce01e9a..7dfd541 100644
--- a/sw/Module_sw.mk
+++ b/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
diff --git a/sw/qa/unoapi/sw.sce b/sw/qa/unoapi/sw_1.sce
similarity index 51%
rename from sw/qa/unoapi/sw.sce
rename to sw/qa/unoapi/sw_1.sce
index 4ea9fab..2e18c8d 100644
--- a/sw/qa/unoapi/sw.sce
+++ b/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
diff --git a/sw/qa/unoapi/sw_2.sce b/sw/qa/unoapi/sw_2.sce
new file mode 100644
index 0000000..a0a8c10
--- /dev/null
+++ b/sw/qa/unoapi/sw_2.sce
@@ -0,0 +1,45 @@
+#
+# 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
diff --git a/sw/qa/unoapi/sw_3.sce b/sw/qa/unoapi/sw_3.sce
new file mode 100644
index 0000000..585a9ba
--- /dev/null
+++ b/sw/qa/unoapi/sw_3.sce
@@ -0,0 +1,37 @@
+#
+# 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
diff --git a/sw/qa/unoapi/sw_4.sce b/sw/qa/unoapi/sw_4.sce
new file mode 100644
index 0000000..127f3af
--- /dev/null
+++ b/sw/qa/unoapi/sw_4.sce
@@ -0,0 +1,35 @@
+#
+# 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
More information about the Libreoffice-commits
mailing list