summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2016-01-08 07:58:56 +0100
committerArmin Rigo <arigo@tunes.org>2016-01-08 07:58:56 +0100
commit08ed5b405be38cbe5ee650a9a0dd527f02effb64 (patch)
treeb6539360724aae8bee599dd7e979e1a6dca1428e
parentd8375289bd022be59c167d3605f052433471a1fd (diff)
downloadcffi-08ed5b405be38cbe5ee650a9a0dd527f02effb64.tar.gz
fix
-rw-r--r--testing/embedding/test_basic.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py
index 23fb67c..d255f1e 100644
--- a/testing/embedding/test_basic.py
+++ b/testing/embedding/test_basic.py
@@ -68,7 +68,12 @@ class EmbeddingTests:
path = self.get_path()
env = os.environ.copy()
env['PYTHONPATH'] = os.path.dirname(os.path.dirname(local_dir))
- env['LD_LIBRARY_PATH'] = path
+ libpath = env.get('LD_LIBRARY_PATH')
+ if libpath:
+ libpath = path + ':' + libpath
+ else:
+ libpath = path
+ env['LD_LIBRARY_PATH'] = libpath
print 'running %r in %r' % (name, path)
popen = subprocess.Popen([name], cwd=path, env=env,
stdout=subprocess.PIPE)