diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-06-03 10:34:55 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-06-17 11:53:38 -0400 |
| commit | 57909b53d6d2099e45873688b659ce071f6039ef (patch) | |
| tree | e97b29cad444268cdef507abf83205bff3367ef7 /mesonbuild/mtest.py | |
| parent | b1649899a2d392bd0a4c3a629614d29aafd73bb9 (diff) | |
| download | meson-57909b53d6d2099e45873688b659ce071f6039ef.zip meson-57909b53d6d2099e45873688b659ce071f6039ef.tar.gz meson-57909b53d6d2099e45873688b659ce071f6039ef.tar.bz2 | |
Improve WINEPATH reduction
- Remove duplicated code in mdevenv.py
- Change the limit to 1024 instead of 2048 which is what has been
tested.
- Skip shortening if it is already short enough.
- Skip shortening with wine >= 6.4 which does not seems to have that
limitation any more.
- Downgrade exception to warning in the case WINEPATH cannot be
shortened under 1024 chars, it is possible that it will still work.
Diffstat (limited to 'mesonbuild/mtest.py')
| -rw-r--r-- | mesonbuild/mtest.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index ea5b2da..d733ce8 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -1338,7 +1338,8 @@ class SingleTestRunner: if os.path.basename(c).startswith('wine'): env['WINEPATH'] = get_wine_shortpath( winecmd, - ['Z:' + p for p in self.test.extra_paths] + env.get('WINEPATH', '').split(';') + ['Z:' + p for p in self.test.extra_paths] + env.get('WINEPATH', '').split(';'), + self.test.workdir ) break |