diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-02-15 22:49:09 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-02-17 14:48:27 -0500 |
| commit | ed262cad97daa9d00fe44a39fd04dfa4eb763d7b (patch) | |
| tree | 7a7999f9e3e5f8d6239c2cf1d0aa44ba0c428eb1 | |
| parent | 62a6c95c133045aaba9262c7bac6f1f55384d614 (diff) | |
| download | meson-ed262cad97daa9d00fe44a39fd04dfa4eb763d7b.zip meson-ed262cad97daa9d00fe44a39fd04dfa4eb763d7b.tar.gz meson-ed262cad97daa9d00fe44a39fd04dfa4eb763d7b.tar.bz2 | |
tests: do not use a GNU bash script to check the minimum version of programs
find_program() can check that for us already, there's no need to
require GNU bash on systems that default to other POSIX shells.
Even though this is the *linuxlike* tests and a POSIX shell is
guaranteed, there is actually no need to require a shell at all. It's
*easier* to use the meson builtin functionality here.
| -rwxr-xr-x | test cases/linuxlike/13 cmake dependency/cmVers.sh | 6 | ||||
| -rw-r--r-- | test cases/linuxlike/13 cmake dependency/meson.build | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/test cases/linuxlike/13 cmake dependency/cmVers.sh b/test cases/linuxlike/13 cmake dependency/cmVers.sh deleted file mode 100755 index 6e096a5..0000000 --- a/test cases/linuxlike/13 cmake dependency/cmVers.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -VERS=$(cmake --version | grep "cmake version") -VERS=${VERS//cmake version/} - -echo -n $VERS diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build index ae4cc42..193ad18 100644 --- a/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build @@ -6,9 +6,6 @@ if not find_program('cmake', required: false).found() error('MESON_SKIP_TEST cmake binary not available.') endif -# CMake version -cm_vers = run_command(find_program('./cmVers.sh'), check: true).stdout().strip() - # Zlib is probably on all dev machines. dep = dependency('ZLIB', version : '>=1.2', method : 'cmake') @@ -69,7 +66,7 @@ test('zlibtest4', exe4) # Test some edge cases with spaces, etc. (but only for CMake >= 3.15) -if cm_vers.version_compare('>=3.15') +if find_program('cmake', required: false, version: '>=3.15').found() testDep1 = dependency('ImportedTarget', required : true, method : 'cmake', cmake_module_path : 'cmake', modules: 'mesonTestLibDefs') testDep2 = dependency('ImportedTarget', required : true, method : 'cmake', cmake_module_path : 'cmake', modules : ['MesonTest::TestLibDefs']) testFlagSet1 = executable('testFlagSet1', ['testFlagSet.c'], dependencies: [testDep1]) |