diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-11-08 03:03:16 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-11-09 07:37:50 +0100 |
| commit | 33e47b44914a20ec657a4f4f69b052eb612cd7f8 (patch) | |
| tree | 6cef3de61a7e32c42dd540fd3742398413d34e1f /unoxml | |
| parent | 84286ac443ea8978743d281efeaa7ddb46199558 (diff) | |
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 <glogow@fbihome.de>
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/JunitTest_unordf_complex.mk | 8 | ||||
| -rw-r--r-- | unoxml/JunitTest_unoxml_complex.mk | 8 |
2 files changed, 2 insertions, 14 deletions
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 \ |