summaryrefslogtreecommitdiff
path: root/solenv/gbuild/CppunitTest.mk
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-09-24 07:48:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-09-25 17:25:54 +0000
commit30adcc07949b048433f3dea6b569f7985b705a48 (patch)
treeda1a823c5da21a26151194a28ff545f9cda62349 /solenv/gbuild/CppunitTest.mk
parent8e30689680c04efc4fc14f6247b5d90e50bc3c0d (diff)
Add LO_JAVA_DIR to CppunitTest env.
This is needed for e.g. HSQLDB to run in a unit test. Change-Id: I71d6de35fc20512afaebf8a76a052640a07fba6b Reviewed-on: https://gerrit.libreoffice.org/6023 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
-rw-r--r--solenv/gbuild/CppunitTest.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1f9390fe5fb0..154841f8db64 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -61,6 +61,7 @@ $(if $(URE),\
"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \
-env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME)) \
+ -env:LO_JAVA_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)) \
--protector $(call gb_Library_get_target,unoexceptionprotector) unoexceptionprotector \
--protector $(call gb_Library_get_target,unobootstrapprotector) unobootstrapprotector \
) $(ARGS)