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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 8 |
1 files changed, 6 insertions, 2 deletions
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 |