From 33e47b44914a20ec657a4f4f69b052eb612cd7f8 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Thu, 8 Nov 2018 03:03:16 +0100 Subject: 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 --- svl/JunitTest_svl_complex.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'svl') 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 \ )) -- cgit