diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-14 12:44:15 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-09-12 15:38:00 +0100 |
| commit | 1394cb9263a17484fea01ce807402dcc95e68e20 (patch) | |
| tree | 669baecc0c02f0c69df1f5b1bb6c44c2f27ea69a /test cases | |
| parent | 8b3ad3e9a061a0e66b60e31655e10473b05ee5b3 (diff) | |
| download | meson-1394cb9263a17484fea01ce807402dcc95e68e20.tar.gz | |
Correct version_compare_condition_with_min()
Correct version_compare_condition_with_min() for the case where no minimum
version is established by the version constraint. Add a simple test.
Also fix test_feature_check_usage_subprojects by escaping regex
metacharacters.
if |condition| is '<', '<=' or '!=', the minimum version satisfying the
condition is 0, so the minimum version for a feature is never met.
if |condition| is '>=' or '==', the minimum version satisfying the condition
is the version compared with, so the minimum version for a feature must be
less than or equal to that.
if |condition| is '>', the minimum version satisfying the condition is
greater than the version compared with, so the minimum version for a feature
must be less than that
(it's this last condition that makes this function necessary, as in all
other cases we could establish a definite minimum version which we could
compare to see if it's less than or equal to the current version)
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/unit/41 featurenew subprojects/meson.build | 1 | ||||
| -rw-r--r-- | test cases/unit/41 featurenew subprojects/subprojects/baz/meson.build | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test cases/unit/41 featurenew subprojects/meson.build b/test cases/unit/41 featurenew subprojects/meson.build index 27898cd79..d136bed1c 100644 --- a/test cases/unit/41 featurenew subprojects/meson.build +++ b/test cases/unit/41 featurenew subprojects/meson.build @@ -4,3 +4,4 @@ foo = {} subproject('foo') subproject('bar') +subproject('baz') diff --git a/test cases/unit/41 featurenew subprojects/subprojects/baz/meson.build b/test cases/unit/41 featurenew subprojects/subprojects/baz/meson.build new file mode 100644 index 000000000..811e7aa4b --- /dev/null +++ b/test cases/unit/41 featurenew subprojects/subprojects/baz/meson.build @@ -0,0 +1,3 @@ +project('baz subproject', meson_version: '!=0.40') + +disabler() |