Skip to content

Commit

Permalink
curl: cleanup version guarded code
Browse files Browse the repository at this point in the history
  • Loading branch information
benoit-pierre authored and neheb committed Sep 10, 2024
1 parent 369f3e0 commit bf58128
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 18 deletions.
1 change: 1 addition & 0 deletions releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@
"libcurl"
],
"versions": [
"8.9.1-2",
"8.9.1-1",
"8.9.0-1",
"8.8.0-1",
Expand Down
3 changes: 1 addition & 2 deletions subprojects/packagefiles/curl/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ project(
'curl',
'c',
version: '8.9.1',
# Version gated use of `test(…, verbose: true)` needs `0.62.0`.
meson_version: meson.version().version_compare('>=0.62.0') ? '>=0.62.0' : '>=0.60.0',
meson_version: '>=0.60.0',
)

fs = import('fs')
Expand Down
29 changes: 13 additions & 16 deletions subprojects/packagefiles/curl/tests/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,8 @@ if ipv6_opt.disabled()
_disabled_tests += '!1614'
endif

_kwargs = {}
if meson.version().version_compare('>=0.62.0')
_kwargs += {'verbose': true}
endif

test(
'runtests',
bash_exe,
args: [
_kwargs = {
'args': [
'-c',
'exec perl "$@"',
'--',
Expand All @@ -118,10 +111,14 @@ test(
# '-v',
_disabled_tests,
],
depends: [curl_exe, libtest_targets, server_targets, unit_targets],
env: _env,
is_parallel: false,
kwargs: _kwargs,
timeout: 0,
workdir: _builddir,
)
'depends': [curl_exe, libtest_targets, server_targets, unit_targets],
'env': _env,
'is_parallel': false,
'timeout': 0,
'workdir': _builddir,
}
if meson.version().version_compare('>=0.62.0')
test('runtests', bash_exe, kwargs: _kwargs + {'verbose': true})
else
test('runtests', bash_exe, kwargs: _kwargs)
endif

0 comments on commit bf58128

Please sign in to comment.