diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-09-16 11:05:44 -0400 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-09-18 03:01:15 +0000 |
commit | e0cd54a32298073830e9141da85aef91dce709e9 (patch) | |
tree | 97faf7e983aae6e7280e8783a135c6114071793d /run_unittests.py | |
parent | c203e2f92b118eb1138246b1eefd179161f54aab (diff) | |
download | meson-e0cd54a32298073830e9141da85aef91dce709e9.zip meson-e0cd54a32298073830e9141da85aef91dce709e9.tar.gz meson-e0cd54a32298073830e9141da85aef91dce709e9.tar.bz2 |
msubprojects: Stop trying to guess subproject type
It was done to include them in `meson subprojects foreach` without
--types argument, but it's better to special case missing --types and
include wraps that have type=None too. It was a bad idea because that
was messing them in `meson subprojects update`, now they are ignored by
that command.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/run_unittests.py b/run_unittests.py index 29a330d..69f7932 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -9100,6 +9100,8 @@ class SubprojectsCommandTests(BasePlatformTests): def test_foreach(self): self._create_project(self.subprojects_dir / 'sub_file') self._wrap_create_file('sub_file') + self._git_create_local_repo('sub_git') + self._wrap_create_git('sub_git') self._git_create_local_repo('sub_git_no_wrap') def ran_in(s): @@ -9112,13 +9114,13 @@ class SubprojectsCommandTests(BasePlatformTests): dummy_cmd = ['true'] out = self._subprojects_cmd(['foreach'] + dummy_cmd) - self.assertEqual(ran_in(out), sorted(['./subprojects/sub_git_no_wrap', './subprojects/sub_file'])) + self.assertEqual(ran_in(out), sorted(['./subprojects/sub_file', './subprojects/sub_git', './subprojects/sub_git_no_wrap'])) out = self._subprojects_cmd(['foreach', '--types', 'git,file'] + dummy_cmd) - self.assertEqual(ran_in(out), sorted(['./subprojects/sub_git_no_wrap', './subprojects/sub_file'])) + self.assertEqual(ran_in(out), sorted(['./subprojects/sub_file', './subprojects/sub_git'])) out = self._subprojects_cmd(['foreach', '--types', 'file'] + dummy_cmd) self.assertEqual(ran_in(out), ['./subprojects/sub_file']) out = self._subprojects_cmd(['foreach', '--types', 'git'] + dummy_cmd) - self.assertEqual(ran_in(out), ['./subprojects/sub_git_no_wrap']) + self.assertEqual(ran_in(out), ['./subprojects/sub_git']) def _clang_at_least(compiler, minver: str, apple_minver: str) -> bool: """ |