HSQLDB / Unit tests

Andrzej Hunt andrzej at ahunt.org
Mon Sep 23 23:54:51 PDT 2013


On Mon, 2013-09-23 at 15:22 +0200, Stephan Bergmann wrote:
[....... cut]
> Therefore, it is a good thing that solenv/gbuild/CppunitTest.mk still 
> defines the relevant bootstrap variables manually.  So, all that might 
> be necessary for you now is
> 
> > 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)
> 
> ---let me know if that patch would make your test work.

Yep, that works. I've uploaded the patch to gerrit to be safe
( https://gerrit.libreoffice.org/#/c/6023/ )  (no rush to have it in, so
feel free to ignore it until after the conference).

Also many thanks for the explanation!

Cheers,

Andrzej




More information about the LibreOffice mailing list