From nobody Fri Sep 12 06:57:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cNQGZ1sKtz66ZNQ; Fri, 12 Sep 2025 06:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cNQGZ1FSpz44LK; Fri, 12 Sep 2025 06:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757660246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugtNTPnehqeUduC+khRb5b+znO1DHw5Q98FpmLDiS8s=; b=jPCIUYRiFz3k9V5d0WnWBVrG6IpaHgsSXJP1E+FMA+76XaHLMHA3SAlar9mLrZYb12DPIb wWtNsPzls4z2LwFaRvPMd8/YSsWop0e9ztW96NO4hs2HJLxwqJtkdaQ05ubsBbcQBiTxrV eIZmUvsbErcloKL0ordzB2R5y+9vOq3+QCMbQ0fiKcHWwnQeqGRJv7uYWMglut9U0bmDv6 1aCBOqJKHai6PzzTTfb/Q7lkHNiv22oofk4RUYnU55LOkljp07itpcddTXL8CJR1Ue1IpQ HsoDhmzKXGo9Gk3OmRWRx1oyzdLlcOvqntKEzVkolXm99y1E/VQ6mGH2hrqZ0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757660246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugtNTPnehqeUduC+khRb5b+znO1DHw5Q98FpmLDiS8s=; b=kJtORdhmk96Ty/1GV5Np/+XjlC2BDI6DumWU/u+XcEON6Xhe/95ziYh+04GRN9o4Fqskpu Zd1+btHX+qEeQ0Nuu0go76ycixZDR+RIELfMYRJukKWGYzOU2dzroJAIS3zb+x9hHWS6cz rQdIDZRGfnNjfiAkZfRcUH14p6pH7xGG4Cid3lj5piqnQv+ufqgkKzwy5he9mRdzptxL/A 1nM/EM+movUmQBq46uGrCvcujlCu9+bHUyqo9+yn+e4emVZXzlYw8ZRStj1aQuGJhxMDab fnROqZbC8PDD1AEd28Lg4EClTdyT3QGxsT+KsqEjOxMvuV/ACvuxxWnaPm7p6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757660246; a=rsa-sha256; cv=none; b=h2qpWxe5TvzlKOXTHZtrjG9dkwafHcWdyFmWetIR8XK6iuy1a3BUxIRffAJHeFje1JRMnb SP5Q0SW6ma0BmzJ+sraYdr8UYZrcilPHu2YwDInN2yd1ShhLDZ9u9tnTflFTjoxdg+kTBz j2j0uOOIML/Czt5d03v1sTY9175Ng0xe1aLS2h/zTNXi15tHefFAEV2W6gtopx1udHJFG/ AnQEhzNvdRPsVbVCl8teWOZAHg0rJhFkj7oJb/gEdAuQLeTwcNCmXoQItTPjwRli9BIJEO Yyg5geO29I2JFTAmSfU/ap3JHoSu/GxpzfUlQHNEkLhu3Ithg1wVqWlxuVNzGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cNQGZ0dNNzjf1; Fri, 12 Sep 2025 06:57:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58C6vPLs051320; Fri, 12 Sep 2025 06:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58C6vPwh051317; Fri, 12 Sep 2025 06:57:25 GMT (envelope-from git) Date: Fri, 12 Sep 2025 06:57:25 GMT Message-Id: <202509120657.58C6vPwh051317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 995d95c309fc - stable/14 - if_ovpn tests: skip float and linklocal test on < 2.7 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 995d95c309fccd312f6e1c27ad4a93544b95780a Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=995d95c309fccd312f6e1c27ad4a93544b95780a commit 995d95c309fccd312f6e1c27ad4a93544b95780a Author: Kristof Provost AuthorDate: 2025-08-29 09:19:26 +0000 Commit: Kristof Provost CommitDate: 2025-09-12 06:32:16 +0000 if_ovpn tests: skip float and linklocal test on < 2.7 Earlier versions (than 2.7.0) do not support float notifications or link-local addresses. Skip the relevant tests there. PR: 289150 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D52234 (cherry picked from commit 512d3c3a2c6391cee61ff41e3fe6304973346857) --- tests/sys/net/if_ovpn/if_ovpn.sh | 2 ++ tests/sys/net/if_ovpn/utils.subr | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh index 0d5dbb908c30..2dae2b1c0336 100644 --- a/tests/sys/net/if_ovpn/if_ovpn.sh +++ b/tests/sys/net/if_ovpn/if_ovpn.sh @@ -492,6 +492,7 @@ linklocal_head() linklocal_body() { ovpn_init + ovpn_check_version 2.7.0 l=$(vnet_mkepair) @@ -1365,6 +1366,7 @@ float_head() float_body() { ovpn_init + ovpn_check_version 2.7.0 l=$(vnet_mkepair) diff --git a/tests/sys/net/if_ovpn/utils.subr b/tests/sys/net/if_ovpn/utils.subr index 0da35119b2bf..fbe7dc98630a 100644 --- a/tests/sys/net/if_ovpn/utils.subr +++ b/tests/sys/net/if_ovpn/utils.subr @@ -40,6 +40,25 @@ ovpn_init() fi } +ovpn_check_version() +{ + expected=$1 + + expected_minor=$(echo $expected | + awk '{ split($1, ver, "\."); print(ver[2]); }') + actual_minor=$(openvpn --version 2>&1 | + awk 'NR == 1 \ + { \ + split($2, ver, "\."); \ + split(ver[2], minor, "_"); \ + print(minor[1]); \ + }') + + if [ ${actual_minor} -lt ${expected_minor} ]; then + atf_skip "OpenVPN version < ${expected}" + fi +} + ovpn_cleanup() { for jail in `cat ovpn_jails.lst | sort -u`