diff options
author | mattip <matti.picus@gmail.com> | 2016-01-30 20:50:18 +0200 |
---|---|---|
committer | mattip <matti.picus@gmail.com> | 2016-01-30 20:50:18 +0200 |
commit | 11b3e23d20dfb3c403925bef9ca9afdee3eff3cb (patch) | |
tree | a68f2c1a8aca1ccf6a1b1bcc43ebbdafa8f62815 /testing/embedding | |
parent | 7ee625579b91bf5c6b36bdd38bd1846a2bcbb3a7 (diff) | |
download | cffi-11b3e23d20dfb3c403925bef9ca9afdee3eff3cb.tar.gz |
allow embedding tests to run on pypy win32
Diffstat (limited to 'testing/embedding')
-rw-r--r-- | testing/embedding/test_basic.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py index bd6d567..44460b1 100644 --- a/testing/embedding/test_basic.py +++ b/testing/embedding/test_basic.py @@ -118,12 +118,18 @@ class EmbeddingTests: def execute(self, name): path = self.get_path() env_extra = {'PYTHONPATH': prefix_pythonpath()} - libpath = os.environ.get('LD_LIBRARY_PATH') - if libpath: - libpath = path + ':' + libpath + if sys.platform == 'win32': + _path = os.environ.get('PATH') + # for libpypy-c.dll or Python27.dll + _path += ';' + os.path.split(sys.executable)[0] + env_extra['PATH'] = _path else: - libpath = path - env_extra['LD_LIBRARY_PATH'] = libpath + libpath = os.environ.get('LD_LIBRARY_PATH') + if libpath: + libpath = path + ':' + libpath + else: + libpath = path + env_extra['LD_LIBRARY_PATH'] = libpath print('running %r in %r' % (name, path)) executable_name = name if sys.platform == 'win32': |