[Libreoffice-commits] core.git: solenv/gbuild

[Andrzej J.R. Hunt]

 solenv/gbuild/CppunitTest.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30adcc07949b048433f3dea6b569f7985b705a48
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Tue Sep 24 07:48:29 2013 +0100

    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 at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1f9390f..154841f 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)