[pypy-commit] cffi static-callback-embedding: Avoid setting LD_LIBRARY_PATH

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: static-callback-embedding
Changeset: r2503:7542730a8ff3
Date: 2016-01-01 11:14 +0100
http://bitbucket.org/cffi/cffi/changeset/7542730a8ff3/

Log:	Avoid setting LD_LIBRARY_PATH

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
@@ -35,14 +35,11 @@
         shutil.copy(os.path.join(local_dir, filename), path)
         self._run(['gcc', filename, '-o', name, '-L.'] +
                   ['%s.so' % modname for modname in modules] +
-                  ['-lpython2.7'])
+                  ['-lpython2.7', '-Wl,-rpath=$ORIGIN/'])
 
     def execute(self, name):
         path = self.get_path()
-        env = os.environ.copy()
-        env['LD_LIBRARY_PATH'] = path
-        popen = subprocess.Popen([name], cwd=path, stdout=subprocess.PIPE,
-                                 env=env)
+        popen = subprocess.Popen([name], cwd=path, stdout=subprocess.PIPE)
         result = popen.stdout.read()
         err = popen.wait()
         if err: