diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-10-30 18:54:04 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2021-10-31 19:22:36 +0530 |
| commit | 04ae1cfb7999e25f476f84572ff0ad853629346c (patch) | |
| tree | 16e9c8f4b1a473f28b5f54a050196f8c6f4394ec /test cases | |
| parent | 2046593825d03c348fb09430e38145d92d9d6b94 (diff) | |
| download | meson-04ae1cfb7999e25f476f84572ff0ad853629346c.zip meson-04ae1cfb7999e25f476f84572ff0ad853629346c.tar.gz meson-04ae1cfb7999e25f476f84572ff0ad853629346c.tar.bz2 | |
Fix cygwin test failure due to shortpath usage
Two tests are failing on Cygwin because the argument is passed as
a long-path and the Path is ending up as a short-path:
AllPlatformTests.test_run_target_files_path
Traceback (most recent call last):
File "/cygdrive/d/a/meson/meson/test cases/common/51 run target/check-env.py", line 22, in <module>
assert build_root == env_build_root
AssertionError
SubprojectsCommandTests.test_purge
> self.assertEqual(deleting(out), sorted([
str(self.subprojects_dir / 'redirect.wrap'),
str(self.subprojects_dir / 'sub_file'),
str(self.subprojects_dir / 'sub_git'),
]))
E AssertionError: Lists differ: ['/cygdrive/c/Users/runneradmin/AppData/Local/Temp/tmpeaa2a49[205 chars]git'] != ['/cygdrive/c/Users/RUNNER~1/AppData/Local/Temp/tmpeaa2a49z/s[196 chars]git']
[...]
['/cygdrive/c/Users/runneradmin/AppData/Local/Temp/tmpeaa2a49z/src/subprojects/redirect.wrap',
^^^^^^^^^^^
['/cygdrive/c/Users/RUNNER~1/AppData/Local/Temp/tmpeaa2a49z/src/subprojects/redirect.wrap',
^^^^^^^^
The fix is to not use the tempdir for all tests, but only for tests
that check the mode.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/51 run target/check-env.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test cases/common/51 run target/check-env.py b/test cases/common/51 run target/check-env.py index cf3eb7c..1c66ffa 100644 --- a/test cases/common/51 run target/check-env.py +++ b/test cases/common/51 run target/check-env.py @@ -15,9 +15,14 @@ assert 'MY_ENV' in os.environ env_source_root = Path(os.environ['MESON_SOURCE_ROOT']).resolve() env_build_root = Path(os.environ['MESON_BUILD_ROOT']).resolve() env_current_source_dir = Path(env_source_root, os.environ['MESON_SUBDIR']).resolve() + +print(sys.argv) argv_paths = [Path(i).resolve() for i in sys.argv[1:]] source_root, build_root, current_source_dir = argv_paths +print(f'{source_root} == {env_source_root}') assert source_root == env_source_root +print(f'{build_root} == {env_build_root}') assert build_root == env_build_root +print(f'{current_source_dir} == {env_current_source_dir}') assert current_source_dir == env_current_source_dir |