comphelper/JunitTest_comphelper_complex.mk | 10 ++--------
connectivity/JunitTest_complex.mk | 3 ++-
dbaccess/JunitTest_dbaccess_complex.mk | 8 ++------
filter/JunitTest_filter_complex.mk | 8 +-------
forms/JunitTest_forms_complex.mk | 8 +-------
framework/JunitTest_framework_complex.mk | 8 +-------
jurt/JunitTest_java_remote.mk | 2 +-
reportdesign/JunitTest_reportdesign_complex.mk | 8 +-------
sc/JunitTest_sc_complex.mk | 8 +-------
sfx2/JunitTest_sfx2_complex.mk | 7 ++-----
solenv/gbuild/JunitTest.mk | 8 ++++++--
sot/JunitTest_sot_complex.mk | 8 +-------
svl/JunitTest_svl_complex.mk | 8 ++------
sw/JunitTest_sw_complex.mk | 11 +----------
toolkit/JunitTest_toolkit_complex.mk | 1 +
ucb/JunitTest_ucb_complex.mk | 8 +-------
unotools/JunitTest_unotools_complex.mk | 7 ++-----
unoxml/JunitTest_unordf_complex.mk | 8 +-------
unoxml/JunitTest_unoxml_complex.mk | 8 +-------
19 files changed, 30 insertions(+), 107 deletions(-)
New commits:
commit 33e47b44914a20ec657a4f4f69b052eb612cd7f8
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu Nov 8 03:03:16 2018 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Fri Nov 9 07:37:50 2018 +0100
Fix many Java subsequentcheck test by using JUH
Splits gb_JunitTest_set_unoapi_test_class_and_jars into two
separate defines as:
- gb_JunitTest_use_unoapi_jars
- gb_JunitTest_use_unoapi_test_class
Then replaces many of the gb_JunitTest_use_jars lists with the
new gb_JunitTest_use_unoapi_jars to fix the JUH dependencies.
This probably adds some unneeded JUH dependencies to some Java
tests, but that shouldn't be a problem.
Change-Id: I0c4fce6b50f7c6eb8d62bfb2c50f056b97584794
Reviewed-on: https://gerrit.libreoffice.org/63119
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/comphelper/JunitTest_comphelper_complex.mk
b/comphelper/JunitTest_comphelper_complex.mk
index af9c3dba88d4..1171eb1cd232 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -19,19 +19,13 @@
$(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
+$(eval $(call gb_JunitTest_use_unoapi_jars,comphelper_complex))
+
$(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
comphelper/qa/complex/comphelper/Map \
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \
))
-$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
-
$(eval $(call gb_JunitTest_add_classes,comphelper_complex,\
complex.comphelper.SequenceOutputStreamUnitTest \
complex.comphelper.Map \
diff --git a/connectivity/JunitTest_complex.mk
b/connectivity/JunitTest_complex.mk
index 40c2882f3c54..9b257d4c1711 100644
--- a/connectivity/JunitTest_complex.mk
+++ b/connectivity/JunitTest_complex.mk
@@ -9,7 +9,8 @@
$(eval $(call gb_JunitTest_JunitTest,connectivity_complex))
-$(eval $(call
gb_JunitTest_set_unoapi_test_class_and_jars,connectivity_complex))
+$(eval $(call gb_JunitTest_use_unoapi_jars,connectivity_complex))
+$(eval $(call gb_JunitTest_use_unoapi_test_class,connectivity_complex))
$(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
$$(DEFS) \
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk
b/dbaccess/JunitTest_dbaccess_complex.mk
index 7a0b17baa0e8..947d9c3ab3c0 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -9,14 +9,10 @@
$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
+$(eval $(call gb_JunitTest_use_unoapi_jars,dbaccess_complex))
+
$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
ConnectivityTools \
- OOoRunner \
- juh \
- jurt \
- ridl \
- test \
- unoil \
))
$(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
diff --git a/filter/JunitTest_filter_complex.mk
b/filter/JunitTest_filter_complex.mk
index b0c590a1be8c..c8f22e1bc1f4 100644
--- a/filter/JunitTest_filter_complex.mk
+++ b/filter/JunitTest_filter_complex.mk
@@ -18,13 +18,7 @@
$(eval $(call gb_JunitTest_JunitTest,filter_complex))
-$(eval $(call gb_JunitTest_use_jars,filter_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,filter_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,filter_complex,\
filter/qa/complex/filter/misc/FinalizedMandatoryTest \
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
index ed4a00af74df..6f95409a8fde 100644
--- a/forms/JunitTest_forms_complex.mk
+++ b/forms/JunitTest_forms_complex.mk
@@ -9,13 +9,7 @@
$(eval $(call gb_JunitTest_JunitTest,forms_complex))
-$(eval $(call gb_JunitTest_use_jars,forms_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,forms_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,forms_complex,\
forms/qa/complex/forms/CheckOGroupBoxModel \
diff --git a/framework/JunitTest_framework_complex.mk
b/framework/JunitTest_framework_complex.mk
index 8ed558899a44..d70666e4bf30 100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -24,13 +24,7 @@ $(eval $(call gb_JunitTest_set_defs,framework_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents
\
))
-$(eval $(call gb_JunitTest_use_jars,framework_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,framework_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\
framework/qa/complex/disposing/GetServiceWhileDisposingOffice \
diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk
index defa35abf76d..f5d6aab0f63b 100644
--- a/jurt/JunitTest_java_remote.mk
+++ b/jurt/JunitTest_java_remote.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_java_remote))
$(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\
- OOoRunner \
+ OOoRunner \
ridl \
))
diff --git a/reportdesign/JunitTest_reportdesign_complex.mk
b/reportdesign/JunitTest_reportdesign_complex.mk
index 8a3fb2efa650..0ba631e4f8a0 100644
--- a/reportdesign/JunitTest_reportdesign_complex.mk
+++ b/reportdesign/JunitTest_reportdesign_complex.mk
@@ -30,13 +30,7 @@ $(eval $(call
gb_JunitTest_add_sourcefiles,reportdesign_complex,\
reportdesign/qa/complex/reportdesign/FileURL \
))
-$(eval $(call gb_JunitTest_use_jars,reportdesign_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,reportdesign_complex))
$(eval $(call gb_JunitTest_add_classes,reportdesign_complex,\
complex.reportdesign.ReportDesignerTest \
diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index 77dc636fe984..cfd869b91917 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -16,13 +16,7 @@ $(eval $(call gb_JunitTest_add_classes,sc_complex, \
complex.sc.CalcRTL \
))
-$(eval $(call gb_JunitTest_use_jars,sc_complex, \
- OOoRunner \
- jurt \
- ridl \
- test \
- unoil \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,sc_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,sc_complex, \
sc/qa/complex/dataPilot/_XDataPilotDescriptor \
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index ee1029e70abb..ac9cb60a42ea 100644
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -24,13 +24,10 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/sfx2/testdocuments \
))
+$(eval $(call gb_JunitTest_use_unoapi_jars,sfx2_complex))
+
$(eval $(call gb_JunitTest_use_jars,sfx2_complex,\
- OOoRunner \
- ridl \
- test \
test-tools \
- unoil \
- jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 1b06a1c5f78d..2e0fe97fa802 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -152,7 +152,7 @@ $(foreach dependency,$(2),$(call
gb_JunitTest_use_customtarget,$(1),$(dependency
endef
-define gb_JunitTest_set_unoapi_test_class_and_jars
+define gb_JunitTest_use_unoapi_jars
$(eval $(call gb_JunitTest_use_jars,$(1),\
OOoRunner \
juh \
@@ -162,6 +162,9 @@ $(eval $(call gb_JunitTest_use_jars,$(1),\
unoil \
))
+endef
+
+define gb_JunitTest_use_unoapi_test_class
$(eval $(call gb_JunitTest_add_classes,$(1),\
org.openoffice.test.UnoApiTest \
))
@@ -187,7 +190,8 @@ $(eval $(call gb_JunitTest_set_defs,$(1),\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/$(gb_JunitTest__unoapi_dir)/$(if
$(5),$(5),testdocuments) \
))
-$(eval $(call gb_JunitTest_set_unoapi_test_class_and_jars,$(1)))
+$(eval $(call gb_JunitTest_use_unoapi_jars,$(1)))
+$(eval $(call gb_JunitTest_use_unoapi_test_class,$(1)))
endef
diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk
index 96be0e9d5ea4..bd8f4b6a10d8 100644
--- a/sot/JunitTest_sot_complex.mk
+++ b/sot/JunitTest_sot_complex.mk
@@ -26,13 +26,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
sot/qa/complex/olesimplestorage/TestHelper \
))
-$(eval $(call gb_JunitTest_use_jars,sot_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,sot_complex))
$(eval $(call gb_JunitTest_add_classes,sot_complex,\
complex.olesimplestorage.OLESimpleStorageUnitTest \
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index 765404236dc3..097cfad9b53f 100644
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -24,13 +24,9 @@ $(eval $(call gb_JunitTest_set_defs,svl_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svl/qa/complex/broken_document/test_documents
\
))
+$(eval $(call gb_JunitTest_use_unoapi_jars,svl_complex))
+
$(eval $(call gb_JunitTest_use_jars,svl_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
- juh \
ConnectivityTools \
))
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index a4d7a08ec02b..41785d5c49f6 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -23,15 +23,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/indeterminateState/CheckIndeterminateState \
))
-$(eval $(call gb_JunitTest_use_jars,sw_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,sw_complex,\
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,sw_complex))
# vim: set noet sw=4 ts=4:
diff --git a/toolkit/JunitTest_toolkit_complex.mk
b/toolkit/JunitTest_toolkit_complex.mk
index 6f9b069902ec..2c79bd0e40e3 100644
--- a/toolkit/JunitTest_toolkit_complex.mk
+++ b/toolkit/JunitTest_toolkit_complex.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
$(eval $(call gb_JunitTest_use_jars,toolkit_complex,\
OOoRunner \
+ juh \
ridl \
test \
unoil \
diff --git a/ucb/JunitTest_ucb_complex.mk b/ucb/JunitTest_ucb_complex.mk
index 9cfa504f2368..6aa02ff9dbfb 100644
--- a/ucb/JunitTest_ucb_complex.mk
+++ b/ucb/JunitTest_ucb_complex.mk
@@ -14,13 +14,7 @@ $(eval $(call gb_JunitTest_set_defs,ucb_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/ucb/qa/complex/testdocuments \
))
-$(eval $(call gb_JunitTest_use_jars,ucb_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,ucb_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,ucb_complex,\
ucb/qa/complex/ucb/UCB \
diff --git a/unotools/JunitTest_unotools_complex.mk
b/unotools/JunitTest_unotools_complex.mk
index b7a02f90544c..a67340493336 100644
--- a/unotools/JunitTest_unotools_complex.mk
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -9,13 +9,10 @@
$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
+$(eval $(call gb_JunitTest_use_unoapi_jars,unotools_complex))
+
$(eval $(call gb_JunitTest_use_jars,unotools_complex,\
- OOoRunner \
- jurt \
- ridl \
test-tools \
- test \
- unoil \
))
$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
diff --git a/unoxml/JunitTest_unordf_complex.mk
b/unoxml/JunitTest_unordf_complex.mk
index a6c40156abc4..948a68303994 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -24,13 +24,7 @@ $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments
\
))
-$(eval $(call gb_JunitTest_use_jars,unordf_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,unordf_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,unordf_complex,\
unoxml/qa/complex/unoxml/RDFRepositoryTest \
diff --git a/unoxml/JunitTest_unoxml_complex.mk
b/unoxml/JunitTest_unoxml_complex.mk
index 737e1cb73068..4b98f2fd2d51 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -24,13 +24,7 @@ $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments
\
))
-$(eval $(call gb_JunitTest_use_jars,unoxml_complex,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-))
+$(eval $(call gb_JunitTest_use_unoapi_jars,unoxml_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,unoxml_complex,\
unoxml/qa/complex/unoxml/DOMTest \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
