diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2019-12-15 11:22:52 -0500 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.com> | 2020-03-06 15:26:02 -0500 |
| commit | 823c83b2696b517289dbfa0f524fd938bc4001e2 (patch) | |
| tree | 279438f8dd5482bb101289135ea7400f31ef280e /test cases/linuxlike | |
| parent | d40c26e5fd642724155da813a4f2de0c05b52449 (diff) | |
| download | meson-823c83b2696b517289dbfa0f524fd938bc4001e2.tar.gz | |
dependency: Verify fallback variable consistency
This change made `5 dependency versions` unit test fail because now once
a subproject has been configured, the fallback variable is checked to be
consistent. So it has to use new subproject because 'somesub' was
already configured by previous tests.
Diffstat (limited to 'test cases/linuxlike')
| -rw-r--r-- | test cases/linuxlike/5 dependency versions/meson.build | 6 | ||||
| -rw-r--r-- | test cases/linuxlike/5 dependency versions/subprojects/fakezlib/meson.build | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/test cases/linuxlike/5 dependency versions/meson.build b/test cases/linuxlike/5 dependency versions/meson.build index cb58a64d7..94f424deb 100644 --- a/test cases/linuxlike/5 dependency versions/meson.build +++ b/test cases/linuxlike/5 dependency versions/meson.build @@ -71,18 +71,18 @@ assert(somefail_dep.found() == false, 'somefail_dep found via wrong fallback') # Fallback should only be used if the primary was not found fallbackzlib_dep = dependency('zlib', - fallback : ['somelib', 'fakezlib_dep']) + fallback : ['fakezlib', 'fakezlib_dep']) assert(fallbackzlib_dep.type_name() == 'pkgconfig', 'fallbackzlib_dep should be of type "pkgconfig", not ' + fallbackzlib_dep.type_name()) # Check that the above dependency was pkgconfig because the fallback wasn't # checked, not because the fallback didn't work fakezlib_dep = dependency('fakezlib', - fallback : ['somelib', 'fakezlib_dep']) + fallback : ['fakezlib', 'fakezlib_dep']) assert(fakezlib_dep.type_name() == 'internal', 'fakezlib_dep should be of type "internal", not ' + fakezlib_dep.type_name()) # Verify that once we got a system dependency, we won't fallback if a newer # version is requested. d = dependency('zlib', version: '>= 999', - fallback : ['somelib', 'some_dep'], + fallback : ['donotexist', 'fakezlib_dep'], required: false) assert(not d.found(), 'version should not match and it should not fallback') diff --git a/test cases/linuxlike/5 dependency versions/subprojects/fakezlib/meson.build b/test cases/linuxlike/5 dependency versions/subprojects/fakezlib/meson.build new file mode 100644 index 000000000..5a077638e --- /dev/null +++ b/test cases/linuxlike/5 dependency versions/subprojects/fakezlib/meson.build @@ -0,0 +1,3 @@ +project('some', 'c', version : '0.1') + +fakezlib_dep = declare_dependency() |