diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-26 20:12:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-26 18:53:00 +0000 |
| commit | 3803460589e6f158267315848728ccaba7d57275 (patch) | |
| tree | 042b2c887f35cbcb0df15b362393fb53e2aba20c /solenv/qa | |
| parent | b6f98b71155d3c7af70bfc623cfaa7da0fbb905f (diff) | |
solenv: fix Windows build
Traceback (most recent call last):
File "C:cygwinhometdflodejenkinsworkspacelo_gerritConfigwindows_msc_dbgutil_32solenvqapythongbuildtoide.py", line 32, in test_gbuildtoide
del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that
File "C:cygwinhometdflodejenkinsworkspacelo_gerritConfigwindows_msc_dbgutil_32instdirprogram\python-core-3.3.0libos.py", line 692, in __delitem__
raise KeyError(key) from None
KeyError: 'LD_LIBRARY_PATH'
Change-Id: I1575caf90cafffd71dd28fedc46b5e3570848be8
Reviewed-on: https://gerrit.libreoffice.org/30304
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv/qa')
| -rw-r--r-- | solenv/qa/python/gbuildtoide.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py index 4de079e85c55..e18999514b04 100644 --- a/solenv/qa/python/gbuildtoide.py +++ b/solenv/qa/python/gbuildtoide.py @@ -29,7 +29,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 + if 'LD_LIBRARY_PATH' in os.environ: + 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')) @@ -70,3 +71,5 @@ class CheckGbuildToIde(unittest.TestCase): if __name__ == "__main__": unittest.main() + +# vim:set shiftwidth=4 softtabstop=4 expandtab: |