diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-11-08 17:42:02 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-11-13 16:13:47 +0000 |
| commit | eab97e0c4441923c2cb09838488da0f34dab497a (patch) | |
| tree | 08b138c5984039859fd33a54406a04236ad0aee9 | |
| parent | 7f9aa9208cdefba78203e450f0573df84aeda5c9 (diff) | |
| download | meson-eab97e0c4441923c2cb09838488da0f34dab497a.zip meson-eab97e0c4441923c2cb09838488da0f34dab497a.tar.gz meson-eab97e0c4441923c2cb09838488da0f34dab497a.tar.bz2 | |
Workaround python 3.7.1 requiring that PYTHONPATH end in os.sep
| -rwxr-xr-x | run_meson_command_tests.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/run_meson_command_tests.py b/run_meson_command_tests.py index 390868a..6dc7964 100755 --- a/run_meson_command_tests.py +++ b/run_meson_command_tests.py @@ -124,7 +124,9 @@ class CommandTests(unittest.TestCase): pylibdir = prefix / get_pypath() bindir = prefix / get_pybindir() pylibdir.mkdir(parents=True) - os.environ['PYTHONPATH'] = str(pylibdir) + # XXX: join with empty name so it always ends with os.sep otherwise + # distutils complains that prefix isn't contained in PYTHONPATH + os.environ['PYTHONPATH'] = os.path.join(str(pylibdir), '') os.environ['PATH'] = str(bindir) + os.pathsep + os.environ['PATH'] self._run(python_command + ['setup.py', 'install', '--prefix', str(prefix)]) # Check that all the files were installed correctly |