path: root/configmgr/
diff options
authorJan-Marek Glogowski <>2018-11-08 00:48:14 +0100
committerJan-Marek Glogowski <>2018-11-09 07:37:00 +0100
commit84286ac443ea8978743d281efeaa7ddb46199558 (patch)
tree916a3175c92da40e4ac521586f74b01dcb71e07f /configmgr/
parent5063e7fc09b38b77a3ff4c200b68cf2c8947462d (diff)
Simplify and fix Java UNO API test makefiles
Originally I just wanted to add the juh.jar to the list of jars of the UNO API tests, but this became tedious work, so after the first few files I decided to replace the similiar makefiles with a common define for the *_unoapi* tests. This patch adds two new make defines to be used used by Java UNO and UNO API tests: - gb_JunitTest_set_unoapi_test_defaults - gb_JunitTest_set_unoapi_test_class_and_jars The first one will deduce most defaults from the test name, but still allows to optionally override most settings. If a test doesn't match the default at all, the 2nd define still shares the common jar files and the main Java UNO class, so the second define adds these to your makefile. The real fix is to add juh.jar to gb_JunitTest_use_jars. Change-Id: I4342fdac5e31f85ea18fb4268e13c287a7adc2b7 Reviewed-on: Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <>
Diffstat (limited to 'configmgr/')
1 files changed, 1 insertions, 18 deletions
diff --git a/configmgr/ b/configmgr/
index b3b6e49e90ae..51dcc8a07eb5 100644
--- a/configmgr/
+++ b/configmgr/
@@ -9,23 +9,6 @@
$(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi))
-$(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
- $$(DEFS) \
- -Dorg.openoffice.test.arg.sce=$(SRCDIR)/configmgr/qa/unoapi/module.sce \
- -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/configmgr/qa/unoapi/knownissues.xcl \
- -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/configmgr/qa/unoapi/testdocuments \
-$(eval $(call gb_JunitTest_use_jars,configmgr_unoapi,\
- OOoRunner \
- ridl \
- test \
- unoil \
- jurt \
-$(eval $(call gb_JunitTest_add_classes,configmgr_unoapi,\
- org.openoffice.test.UnoApiTest \
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,configmgr_unoapi,,module.sce))
# vim: set noet sw=4 ts=4: