[pypy-commit] cffi static-callback-embedding: fix

arigo pypy.commits at gmail.com
Fri Jan 8 01:59:05 EST 2016


Author: Armin Rigo <arigo at tunes.org>
Branch: static-callback-embedding
Changeset: r2549:2db0bf58185a
Date: 2016-01-08 07:58 +0100
http://bitbucket.org/cffi/cffi/changeset/2db0bf58185a/

Log:	fix

diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py
--- a/testing/embedding/test_basic.py
+++ b/testing/embedding/test_basic.py
@@ -68,7 +68,12 @@
         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)


More information about the pypy-commit mailing list