diff options
| author | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-04 09:45:41 -0300 |
|---|---|---|
| committer | Thibault Saunier <thibault.saunier@osg.samsung.com> | 2016-10-14 11:25:15 +0200 |
| commit | 7e2390f3558d05b3168dc57f2c2fe923b8ed12af (patch) | |
| tree | 25acfbcc33da8afa60654b433c1fd04d13fcbec7 /test cases | |
| parent | b6b8d561b84eb950d1503e682ca2eab3b656efa9 (diff) | |
| download | meson-7e2390f3558d05b3168dc57f2c2fe923b8ed12af.tar.gz | |
interpreter: Add a type_name method to DependencyHolder
And remove the InternalDependencyHolder class.
In some cases we need to know the type of dependency we are
dealing with. For example in GStreamer if the dependency
is not an internal one, then we need to get some env var
from pkg-config to know where to find some plugins necessary
to run some tests.
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/linuxlike/5 dependency versions/meson.build | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test cases/linuxlike/5 dependency versions/meson.build b/test cases/linuxlike/5 dependency versions/meson.build index a3ee33598..9bc264cf1 100644 --- a/test cases/linuxlike/5 dependency versions/meson.build +++ b/test cases/linuxlike/5 dependency versions/meson.build @@ -6,6 +6,7 @@ zlib = dependency('zlib') zlibver = dependency('zlib', version : '>1.0') assert(zlib.version() == zlibver.version(), 'zlib versions did not match!') # Find external dependency with conflicting version +assert(zlib.type_name() == 'pkgconfig', 'zlib should be of type "pkgconfig" not ' + zlib.type_name()) zlibver = dependency('zlib', version : '<1.0', required : false) assert(zlibver.found() == false, 'zlib <1.0 should not be found!') @@ -16,6 +17,7 @@ dependency('somebrokenlib', version : '>=1.0', required : false) # Find internal dependency without version somelibver = dependency('somelib', fallback : ['somelibnover', 'some_dep']) +assert(somelibver.type_name() == 'internal', 'somelibver should be of type "internal", not ' + somelibver.type_name()) # Find an internal dependency again with the same name and a specific version somelib = dependency('somelib', version : '== 0.1', |