github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selftests/vsock: accept vng 1.33 or >= 1.36

Browse Source 
The current vng version check uses a discrete allowlist of "1.33",
"1.36", and "1.37", which forces a script update on every new release
even though all post-1.36 releases work.

Replace the discrete list with: "1.33", or any version >= 1.36. 1.34
and 1.35 are skipped because they were not tested. Add a version_lt()
helper that compares MAJOR.MINOR numerically, so the check reads as a
straightforward version comparison.

Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com>
Link: https://patch.msgid.link/20260612-vsock-test-update-v1-1-7d7eeed3ac8f@meta.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Bobby Eshleman 2026-06-12 12:08:41 -07:00 committed by Jakub Kicinski
parent 8ac44d24c3
commit 197503d5ac
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/testing/selftests/vsock/vmtest.sh
View File

@ -330,27 +330,34 @@ check_netns() {
return 0
}
check_vng() {
local tested_versions
local version
local ok
# Compare MAJOR.MINOR versions numerically. Returns 0 (true) if $1 < $2.
version_lt() {
local -a a=(${1//./ })
local -a b=(${2//./ })
tested_versions=("1.33" "1.36" "1.37")
version="$(vng --version)"
ok=0
for tv in "${tested_versions[@]}"; do
if [[ "${version}" == *"${tv}"* ]]; then
ok=1
break
fi
done
if [[ ! "${ok}" -eq 1 ]]; then
printf "warning: vng version '%s' has not been tested and may " "${version}" >&2
printf "not function properly.\n\tThe following versions have been tested: " >&2
echo "${tested_versions[@]}" >&2
if [[ "${a[0]}" -lt "${b[0]}" ]]; then
return 0
elif [[ "${a[0]}" -gt "${b[0]}" ]]; then
return 1
elif [[ "${a[1]}" -lt "${b[1]}" ]]; then
return 0
fi
return 1
}
check_vng() {
local version
version="$(vng --version | awk '{print $2}')"
# Supported: 1.33, or any version >= 1.36. 1.34 and 1.35 are untested.
if [[ "${version}" == "1.33" ]] || ! version_lt "${version}" "1.36"; then
return
fi
printf "warning: vng version '%s' has not been tested and may " "${version}" >&2
printf "not function properly.\n\tSupported: 1.33 or >= 1.36\n" >&2
}
check_socat() {