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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/JunitTest_framework_complex.mk | 8 |
1 files changed, 1 insertions, 7 deletions
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 \ |