diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-10-31 09:54:07 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-10-31 11:09:38 +0000 |
| commit | 735e5bb85578dd749d3ccf016b7c08b0f2bb1edf (patch) | |
| tree | 0c764801155dbd86ef0ac1f24ec55a0edb343d6f /solenv | |
| parent | 77837fb21c6967b0664ecc16e0fc2d37f4584e82 (diff) | |
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@redhat.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToIde.mk | 1 | ||||
| -rw-r--r-- | solenv/qa/python/gbuildtoide.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk b/solenv/gbuild/extensions/post_GbuildToIde.mk index 4ed8d61cd4c1..90cec6a1206c 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 4be7f0b76dec..84eb8852c9a0 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: |