diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-17 11:47:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-17 12:52:26 +0200 |
| commit | b254f4fb0a2d53da8f4c6a16ec7e393ee91620c4 (patch) | |
| tree | 8db74fefb0c0f168996b53b5d1dc4f6e80293951 /connectivity/JunitTest_complex.mk | |
| parent | 3e88d02082219c318555c0eaaa739de3d4ea8a5d (diff) | |
gbuild: add gb_Junit_use_external and clean up connectivity complex test
Change-Id: I8c4b6ff6b1993d1c4de68696089f86fbcf4cecc6
Diffstat (limited to 'connectivity/JunitTest_complex.mk')
| -rw-r--r-- | connectivity/JunitTest_complex.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/connectivity/JunitTest_complex.mk b/connectivity/JunitTest_complex.mk index 59fcdc6ef5e5..609f5ea410cc 100644 --- a/connectivity/JunitTest_complex.mk +++ b/connectivity/JunitTest_complex.mk @@ -32,7 +32,6 @@ $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/connectivity/qa/scenearios.sce \ )) -# TODO: add use_externals to JunitTest $(eval $(call gb_JunitTest_use_jars,connectivity_complex,\ jurt \ OOoRunner \ @@ -41,13 +40,9 @@ $(eval $(call gb_JunitTest_use_jars,connectivity_complex,\ unoil \ )) -ifeq ($(SYSTEM_HSQLDB),YES) -$(eval $(call gb_JavaClassSet_use_system_jar,$(call gb_JunitTest_get_classsetname,connectivity_complex),$(HSQLDB_JAR))) -else -$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\ +$(eval $(call gb_JunitTest_use_externals,connectivity_complex,\ hsqldb \ )) -endif $(eval $(call gb_JunitTest_add_classes,connectivity_complex,\ org.openoffice.test.UnoApiTest \ |