diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-16 18:01:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-16 18:01:48 +0300 |
| commit | 04eda3efc8d198ec146d8a5eb7dc8f32d2b0bb28 (patch) | |
| tree | 9df6226f426298d1900ede702434ab767cb6e4e6 /test cases | |
| parent | f30be6fb9232b297d9da73d01d8053bbf4b409fb (diff) | |
| parent | 77b379f5cf5f395257fdbbc56775dd906c5f2a3e (diff) | |
| download | meson-04eda3efc8d198ec146d8a5eb7dc8f32d2b0bb28.tar.gz | |
Merge pull request #861 from thiblahute/master
Add a .copy() method to environment object and add a way to let the user know if a dependency is internal
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/linuxlike/5 dependency versions/meson.build | 6 | ||||
| -rw-r--r-- | test cases/linuxlike/5 dependency versions/subprojects/somelib/meson.build | 3 |
2 files changed, 9 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..1de87c80a 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', @@ -30,3 +32,7 @@ somelibfail = dependency('somelib', required : false, fallback : ['somelibfail', 'some_dep']) assert(somelibfail.found() == false, 'somelibfail found via wrong fallback') + +fakezlib_dep = dependency('zlib', + fallback : ['somelib', 'fakezlib_dep']) +assert(fakezlib_dep.type_name() == 'internal', 'fakezlib_dep should be of type "internal", not ' + fakezlib_dep.type_name()) diff --git a/test cases/linuxlike/5 dependency versions/subprojects/somelib/meson.build b/test cases/linuxlike/5 dependency versions/subprojects/somelib/meson.build index 049c58b2d..086e514b9 100644 --- a/test cases/linuxlike/5 dependency versions/subprojects/somelib/meson.build +++ b/test cases/linuxlike/5 dependency versions/subprojects/somelib/meson.build @@ -6,3 +6,6 @@ someinc = include_directories('.') some_dep = declare_dependency(link_with : somelib, include_directories : someinc) + +fakezlib_dep = declare_dependency(link_with : somelib, + include_directories : someinc) |