Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

msubprojects: Fix unit tests on Windows

This commit is contained in:
Xavier Claessens 2020-09-16 14:05:44 -04:00 committed by Nirbheek Chauhan
parent da72e6284e
commit 17f07a53d0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mesonbuild/msubprojects.py
View File

@ -1,5 +1,6 @@
import os, subprocess import os, subprocess
import argparse import argparse
from pathlib import Path
from . import mlog from . import mlog
from .mesonlib import quiet_git, verbose_git, GitException, Popen_safe, MesonException from .mesonlib import quiet_git, verbose_git, GitException, Popen_safe, MesonException
@ -338,7 +339,7 @@ def run(options):
for wrap in wraps: for wrap in wraps:
if types and wrap.type not in types: if types and wrap.type not in types:
continue continue
dirname = os.path.join(subprojects_dir, wrap.directory) dirname = Path(subprojects_dir, wrap.directory).as_posix()
if not options.subprojects_func(wrap, dirname, options): if not options.subprojects_func(wrap, dirname, options):
failures.append(wrap.name) failures.append(wrap.name)
if failures: if failures:

8
run_unittests.py
View File

@ -9125,13 +9125,13 @@ class SubprojectsCommandTests(BasePlatformTests):
dummy_cmd = ['true'] dummy_cmd = ['true']
out = self._subprojects_cmd(['foreach'] + dummy_cmd) out = self._subprojects_cmd(['foreach'] + dummy_cmd)
self.assertEqual(ran_in(out), sorted(['./subprojects/sub_file', './subprojects/sub_git', './subprojects/sub_git_no_wrap'])) 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) out = self._subprojects_cmd(['foreach', '--types', 'git,file'] + dummy_cmd)
self.assertEqual(ran_in(out), sorted(['./subprojects/sub_file', './subprojects/sub_git'])) self.assertEqual(ran_in(out), sorted(['subprojects/sub_file', 'subprojects/sub_git']))
out = self._subprojects_cmd(['foreach', '--types', 'file'] + dummy_cmd) out = self._subprojects_cmd(['foreach', '--types', 'file'] + dummy_cmd)
self.assertEqual(ran_in(out), ['./subprojects/sub_file']) self.assertEqual(ran_in(out), ['subprojects/sub_file'])
out = self._subprojects_cmd(['foreach', '--types', 'git'] + dummy_cmd) out = self._subprojects_cmd(['foreach', '--types', 'git'] + dummy_cmd)
self.assertEqual(ran_in(out), ['./subprojects/sub_git']) self.assertEqual(ran_in(out), ['subprojects/sub_git'])
def _clang_at_least(compiler, minver: str, apple_minver: str) -> bool: def _clang_at_least(compiler, minver: str, apple_minver: str) -> bool:
""" """