From 1bc3d91112c046006da26d1a5c77af4854c6899b Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Sun, 26 Mar 2023 10:51:28 +0200 Subject: minstall: Fix install_subdir() excludes with path separators on Win The paths in meson.build use / as path separator, however, the paths constructed during the directory structure walk use native path separators, thus the path never compare equal to the excluded ones. Normalize the exclusion paths before the comparison. --- unittests/allplatformstests.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'unittests') diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index a8ec787b8..493cb9c03 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -441,14 +441,15 @@ class AllPlatformTests(BasePlatformTests): self.init(testdir) intro = self.introspect('--installed') expected = { + 'nested_elided/sub': 'share', + 'new_directory': 'share/new_directory', + 'sub/sub1': 'share/sub1', + 'sub1': 'share/sub1', 'sub2': 'share/sub2', + 'sub3': '/usr/share/sub3', + 'sub_elided': 'share', 'subdir/sub1': 'share/sub1', 'subdir/sub_elided': 'share', - 'sub1': 'share/sub1', - 'sub/sub1': 'share/sub1', - 'sub_elided': 'share', - 'nested_elided/sub': 'share', - 'new_directory': 'share/new_directory', } self.assertEqual(len(intro), len(expected)) -- cgit v1.2.1