mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stuff in a mechanism to find the liblangtag share dir during unit tests

Browse Source 
Change-Id: Idf67c3dfbff7ee5c13831159a913ce8a517732ca
This commit is contained in:
Caolán McNamara
2012-08-31 13:41:26 +01:00
parent fab0a2c606
commit f7347f2edd
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
i18npool/source/languagetag/languagetag.cxx
View File

@@ -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
{

1
solenv/gbuild/CppunitTest.mk
View File

@@ -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))") \