summaryrefslogtreecommitdiff
path: root/unotools/JunitTest_unotools_complex.mk
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2018-11-08 03:03:16 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2018-11-09 07:37:50 +0100
commit33e47b44914a20ec657a4f4f69b052eb612cd7f8 (patch)
tree6cef3de61a7e32c42dd540fd3742398413d34e1f /unotools/JunitTest_unotools_complex.mk
parent84286ac443ea8978743d281efeaa7ddb46199558 (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 'unotools/JunitTest_unotools_complex.mk')
-rw-r--r--unotools/JunitTest_unotools_complex.mk7
1 files changed, 2 insertions, 5 deletions
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,\