diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-12-19 20:56:07 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2020-03-06 15:25:46 -0500 |
| commit | 2fdedc4d0fc73c509669bf9f89863017e0f0989b (patch) | |
| tree | fcb933a45797f7a1a1ef4516ba709dfd0888f781 /run_unittests.py | |
| parent | 74769617907f571d2099001d3a7443e23b4f6cda (diff) | |
| download | meson-2fdedc4d0fc73c509669bf9f89863017e0f0989b.zip meson-2fdedc4d0fc73c509669bf9f89863017e0f0989b.tar.gz meson-2fdedc4d0fc73c509669bf9f89863017e0f0989b.tar.bz2 | |
Add meson.override_dependency()
Similar to meson.override_find_program() but overrides the result of the
dependency() function.
Also ensure that dependency() always returns the same result when
looking for the same dependency, this fixes cases where parts of the
project could be using a system library and other parts use the library
provided by a subproject.
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py index 658da37..ee5a713 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3980,7 +3980,7 @@ recommended as it is not supported on some platforms''') { 'descriptive_name': 'sub', 'name': 'sub', - 'version': 'undefined' + 'version': '1.0' } ] } @@ -4555,7 +4555,7 @@ class FailureTests(BasePlatformTests): raise unittest.SkipTest('zlib not found with pkg-config') a = (("dependency('zlib', method : 'fail')", "'fail' is invalid"), ("dependency('zlib', static : '1')", "[Ss]tatic.*boolean"), - ("dependency('zlib', version : 1)", "[Vv]ersion.*string or list"), + ("dependency('zlib', version : 1)", "Item must be a list or one of <class 'str'>"), ("dependency('zlib', required : 1)", "[Rr]equired.*boolean"), ("dependency('zlib', method : 1)", "[Mm]ethod.*string"), ("dependency('zlibfail')", self.dnf),) |