i18npool/source/languagetag/languagetag.cxx | 3 ++- solenv/gbuild/CppunitTest.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit f7347f2eddb9e0b1dc1e3478e9f1efe07355067e Author: Caolán McNamara <caol...@redhat.com> Date: Fri Aug 31 13:41:26 2012 +0100 stuff in a mechanism to find the liblangtag share dir during unit tests Change-Id: Idf67c3dfbff7ee5c13831159a913ce8a517732ca diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx index 9c64b7c..df1533b 100644 --- a/i18npool/source/languagetag/languagetag.cxx +++ b/i18npool/source/languagetag/languagetag.cxx @@ -114,7 +114,8 @@ void LiblantagDataRef::setupDataPath() { // maDataPath is assumed to be empty here. OUString aURL; - if (!rtl::Bootstrap::get( "BRAND_BASE_DIR", aURL)) + + if (!rtl::Bootstrap::get("BRAND_BASE_DIR", aURL) && !rtl::Bootstrap::get("LIBLANGTAG_SHARE", aURL)) OSL_FAIL( "LiblantagDataRef: can't get BRAND_BASE_DIR"); else { diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index feaec22..ef8f320 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -59,6 +59,7 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filen define gb_CppunitTest__make_args --headless \ +"-env:LIBLANGTAG_SHARE=$(call gb_Helper_make_url,$(OUTDIR))" \ $(if $(URE),\ $(if $(strip $(CONFIGURATION_LAYERS)),\ "-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits