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

[Michael Stahl]

 solenv/qa/python/gbuildtoide.py |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5ac920be30928fca515a1a393ba1b2847c12b07e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 26 15:21:32 2016 +0200

    solenv: don't run make with LD_LIBRARY_PATH set
    
    In a build with -fsanitize=address, this fails with:
    
    Change-Id: Ida0d4445d7f829545b493e9dd4c2c4ef33960850
    make: symbol lookup error: instdir/program/libfreebl3.so: undefined symbol: __asan_option_detect_stack_use_after_return

diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index af2014d..4de079e 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -28,6 +28,8 @@ class CheckGbuildToIde(unittest.TestCase):
 
     def test_gbuildtoide(self):
         os.chdir(os.path.join(os.environ['SRCDIR'], 'solenv', 'qa', 'python', 'selftest'))
+        # make may find instdir/program/libfreebl3.so and fall over if that was
+        del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that
         make = os.environ['MAKE']
         subprocess.check_call([make, 'gbuildtoide', 'WORKDIR=%s' % self.tempworkmixed])
         jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 'Library'))