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 --- forms/JunitTest_forms_complex.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'forms') diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk index ed4a00af74df..6f95409a8fde 100644 --- a/forms/JunitTest_forms_complex.mk +++ b/forms/JunitTest_forms_complex.mk @@ -9,13 +9,7 @@ $(eval $(call gb_JunitTest_JunitTest,forms_complex)) -$(eval $(call gb_JunitTest_use_jars,forms_complex,\ - OOoRunner \ - ridl \ - test \ - unoil \ - jurt \ -)) +$(eval $(call gb_JunitTest_use_unoapi_jars,forms_complex)) $(eval $(call gb_JunitTest_add_sourcefiles,forms_complex,\ forms/qa/complex/forms/CheckOGroupBoxModel \ -- cgit