diff options
| author | Tristan Partin <tristan@partin.io> | 2021-06-21 17:23:12 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-02 21:58:22 +0300 |
| commit | 6f3f43bb2d31797b0f3128e1664652571fe314e6 (patch) | |
| tree | b99380e37d6ffd64b88cde1a3bae9e113f918a00 | |
| parent | 210065ffe8c158e0bd53b775e8fe0f009845b747 (diff) | |
| download | meson-6f3f43bb2d31797b0f3128e1664652571fe314e6.zip meson-6f3f43bb2d31797b0f3128e1664652571fe314e6.tar.gz meson-6f3f43bb2d31797b0f3128e1664652571fe314e6.tar.bz2 | |
Flatten test suite value
This behavior is more inline with the rest of Meson
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 4 | ||||
| -rwxr-xr-x | run_unittests.py | 2 | ||||
| -rw-r--r-- | test cases/common/93 suites/meson.build | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index 76d5b16..ef1aae3 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -17,7 +17,7 @@ from ..interpreterbase import ( ContainerTypeInfo, KwargInfo, InterpreterObject, MesonInterpreterObject, ObjectHolder, MutableInterpreterObject, FeatureCheckBase, FeatureNewKwargs, FeatureNew, FeatureDeprecated, - typed_pos_args, typed_kwargs, KwargInfo, stringArgs, permittedKwargs, + typed_pos_args, typed_kwargs, stringArgs, permittedKwargs, noArgsFlattening, noPosargs, noKwargs, permissive_unholder_return, TYPE_var, TYPE_kwargs, TYPE_nvar, TYPE_nkwargs, flatten, resolve_second_level_holders, InterpreterException, InvalidArguments, InvalidCode) from ..dependencies import Dependency, ExternalLibrary, InternalDependency @@ -675,7 +675,7 @@ class Test(MesonInterpreterObject): priority: int): super().__init__() self.name = name - self.suite = suite + self.suite = listify(suite) self.project_name = project self.exe = exe self.depends = depends diff --git a/run_unittests.py b/run_unittests.py index 99c56e2..3140605 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -10181,7 +10181,7 @@ class SubprojectsCommandTests(BasePlatformTests): self._git_create_local_repo('sub_git') self._wrap_create_git('sub_git') - def deleting(s) -> T.List[str]: + def deleting(s: str) -> T.List[str]: ret = [] prefix = 'Deleting ' for l in s.splitlines(): diff --git a/test cases/common/93 suites/meson.build b/test cases/common/93 suites/meson.build index 057e059..2346b5b 100644 --- a/test cases/common/93 suites/meson.build +++ b/test cases/common/93 suites/meson.build @@ -6,4 +6,4 @@ exe1 = executable('exe1', 'exe1.c') exe2 = executable('exe2', 'exe2.c') test('exe1', exe1) -test('exe2', exe2, suite : ['suite2', 'super-special']) +test('exe2', exe2, suite : ['suite2', ['super-special']]) |