diff options
| author | Charles Brunet <charles.brunet@optelgroup.com> | 2025-01-09 17:00:09 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2025-01-27 01:27:03 +0200 |
| commit | 6ee583e119b432fee03f908547729d5da030397e (patch) | |
| tree | 0846a0ed84b6a0c27ec0610c55ccc1ee8786e6b2 /test cases | |
| parent | aecff97e186f40575944c923bb9c43a39fe9708b (diff) | |
| download | meson-6ee583e119b432fee03f908547729d5da030397e.tar.gz | |
allow to compare multiple version with version_compare
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/common/35 string operations/meson.build | 5 | ||||
| -rw-r--r-- | test cases/d/11 dub/meson.build | 2 | ||||
| -rw-r--r-- | test cases/d/14 dub with deps/meson.build | 2 | ||||
| -rw-r--r-- | test cases/osx/3 has function xcode8/meson.build | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/test cases/common/35 string operations/meson.build b/test cases/common/35 string operations/meson.build index 27cc0d8c8..ab77b4947 100644 --- a/test cases/common/35 string operations/meson.build +++ b/test cases/common/35 string operations/meson.build @@ -79,6 +79,11 @@ assert(not version_number.version_compare('!=1.2.8'), 'Version_compare neq broke assert(version_number.version_compare('<2.0'), 'Version_compare major less broken') assert(version_number.version_compare('>0.9'), 'Version_compare major greater broken') +assert(version_number.version_compare('>1.2', '<1.3')) +assert(not version_number.version_compare('>1.2', '>1.3')) +assert(not version_number.version_compare('<1.2', '<1.3')) +assert(version_number.version_compare('>1.0', '>1.2')) + assert(' spaces tabs '.strip() == 'spaces tabs', 'Spaces and tabs badly stripped') assert(''' multiline string '''.strip() == '''multiline string''', 'Newlines badly stripped') diff --git a/test cases/d/11 dub/meson.build b/test cases/d/11 dub/meson.build index 91955710e..cfdb7fa59 100644 --- a/test cases/d/11 dub/meson.build +++ b/test cases/d/11 dub/meson.build @@ -6,7 +6,7 @@ if not dub_exe.found() endif dub_ver = dub_exe.version() -if dub_ver.version_compare('>1.31.1') and dub_ver.version_compare('<1.35.0') +if dub_ver.version_compare('>1.31.1', '<1.35.0') error('MESON_SKIP_TEST: Incompatible Dub version ' + dub_ver) endif diff --git a/test cases/d/14 dub with deps/meson.build b/test cases/d/14 dub with deps/meson.build index 2e3bce87d..c1acfcb1b 100644 --- a/test cases/d/14 dub with deps/meson.build +++ b/test cases/d/14 dub with deps/meson.build @@ -6,7 +6,7 @@ if not dub_exe.found() endif dub_ver = dub_exe.version() -if dub_ver.version_compare('>1.31.1') and dub_ver.version_compare('<1.35.0') +if dub_ver.version_compare('>1.31.1', '<1.35.0') error('MESON_SKIP_TEST: Incompatible Dub version') endif diff --git a/test cases/osx/3 has function xcode8/meson.build b/test cases/osx/3 has function xcode8/meson.build index edd3688f2..8836c0ce8 100644 --- a/test cases/osx/3 has function xcode8/meson.build +++ b/test cases/osx/3 has function xcode8/meson.build @@ -12,7 +12,7 @@ sdk_args = ['-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/M args_10_12 = ['-mmacosx-version-min=10.13'] + sdk_args # Test requires XCode 8 which has the MacOSX 10.12 SDK -if cc.version().version_compare('>=8.0') and cc.version().version_compare('<8.1') +if cc.version().version_compare('>=8.0', '<8.1') if cc.has_function('clock_gettime', args : args_10_11, prefix : '#include <time.h>') error('Should not have found clock_gettime via <time.h> when targeting Mac OS X 10.11') endif |