diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-11-13 19:48:12 +0100 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-11-14 15:00:01 -0800 |
| commit | 5a9c9c70df17c8f1ba900933574586c46c3d096f (patch) | |
| tree | 6773fae10f40561d044e1d2ab28d785b484089ba | |
| parent | de175aac0051b5625e21aeb5b9864ae7c376f9d7 (diff) | |
| download | meson-5a9c9c70df17c8f1ba900933574586c46c3d096f.zip meson-5a9c9c70df17c8f1ba900933574586c46c3d096f.tar.gz meson-5a9c9c70df17c8f1ba900933574586c46c3d096f.tar.bz2 | |
tests: fix test_meson_installed after the recent appveyor image update
Since the last appveyor image update which also included a msys2 update
test_meson_installed() fails for the msys2 mingw jobs complaining that
the install path isn't included in PYTHONPATH.
It complains that "site-packages\" isn't included in "site-packages" ignoring
that the separator should be ignored here. Work around the issue by making
sure that the path set as PYTHONPATH always ends with 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 17fe969..e7eab72 100755 --- a/run_meson_command_tests.py +++ b/run_meson_command_tests.py @@ -123,7 +123,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 |