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

[Bjoern Michaelsen]

 solenv/gbuild/extensions/post_GbuildToIde.mk |    1 +
 solenv/qa/python/gbuildtoide.py              |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 735e5bb85578dd749d3ccf016b7c08b0f2bb1edf
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Oct 31 09:54:07 2016 +0100

    populate library path to gbuildtojson in tests
    
    the test environment clears LD_LIBRARY_PATH as it seems to cause trouble for
    make in ASAN. "make gbuildtoide" only runs the gbuildtojson exe, so make sure
    it gets the LD_LIBRARY_PATH that was filtered out from the make that starts it.
    
    Change-Id: I69ee0024232092aebcd1e8e11b002d6f7eb55c84
    Reviewed-on: https://gerrit.libreoffice.org/30433
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk
index 4ed8d61..90cec6a 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -23,6 +23,7 @@ foo:
 define gb_LinkTarget__command
 mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2))
 mkdir -p $(WORKDIR)/LinkTarget/$(dir $(2))
+$(if $(GBUILDTOJSON_LD_LIBRARY_PATH),LD_LIBRARY_PATH=$(GBUILDTOJSON_LD_LIBRARY_PATH)) \
 $(call gb_Executable_get_command,gbuildtojson) \
 --linktarget=$(call var2file,$(shell $(gb_MKTEMP)),100,$(2)) \
 --ilibtarget=$(call var2file,$(shell $(gb_MKTEMP)),100,$(ILIBTARGET)) \
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 4be7f0b..84eb885 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -28,6 +28,7 @@ def getgbuildtesttools(testcase):
 makeenvvars = ['MAKEOVERRIDES', 'MAKEFLAGS', 'MAKE_TERMERR', 'MAKE_TERMOUT', 'MAKELEVEL', 'MFLAGS']
 def clearmakevars():
     if 'LD_LIBRARY_PATH' in os.environ:
+        os.environ['GBUILDTOJSON_LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']
         del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that
     for makeenvvar in makeenvvars:
         if makeenvvar in os.environ: