From nobody Wed Sep 3 10:10:42 2025 X-Original-To: dev-commits-src-main@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 4cGyzl2jlDz65rt4; Wed, 03 Sep 2025 10:10:43 +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 4cGyzk6fFXz3Lbq; Wed, 03 Sep 2025 10:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756894243; 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=YE9g/tNm4+bYrV5wKmLtoddK83JY2Zh60hYMuGglRCY=; b=rix0ZUkGu1PBj09i0GA2HxloZyWYoVPKhYHqhaSAFMvvJ5bJErKQ+9RVdkKhuxjbCmzlCh ptXXMFYcs4qfsHT6Av88Gyr/IzBTeALYXyGgchlrVHgUU6G5L+1YZMfgWLI3+MrhQddMiZ /oX5cSJvHzQMm7pA7fjcKljB0HM1CBX2NUW1kTuz8wHKFeV9z/+IZSQtfUP86g2MaFeybq yk/nEcEhNMwlvViVvLwyDuNHRSqBKVWWdMzyFOM2NDSVnhf7qwJgoQkKN80vWmq5Zb7atr FRUtlCQgmHuFgVORjkfZXTz2rE28HT+0HwiTsjW5EOR7L3FarPkK8Jkd0GdQTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756894243; 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=YE9g/tNm4+bYrV5wKmLtoddK83JY2Zh60hYMuGglRCY=; b=m6hMSvtnOb2tAGodDp7uouS3IPMqfQo0UfqS0lfWVKYQ45i0aSdoSzAL4H6CvS8GybDSCr VAyetjSHkCmzLxwQjgfA3BoDYqXG24q+sr3otngFTQ//cShVa7V+FnJGfbQOe0CsHDU37/ WEMGyYNE5m8+GAyh2OferiTMtP+yLyx7tmkTsc75f9oDD5FqcGAqHpuWenz1jc/kGkpl+p W3nos2o1tbnQ54WhAocK7CCgyIStTDL2te3Gu8h/1nPkpggNgkauIJ7S3icGw6Ml1s7ZRz O6OVsqyZMUxW91Cq2FjRmN9h6TWQzISb4RISgiymKBiLiOvY2Hq0+ej+6Euftg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756894243; a=rsa-sha256; cv=none; b=QU+8/MO0/hdi3GTauYU91R7EIKulON6XwGBwCs8bTyn5FbWTo+Z9Aw83fI+l5cdHBSImOh 5qSX1UXyFUcsytl00oc+ucggSHRkPTWofw8FyNDD3MJyPurreTY2XPieuIBSyedOh+Kx8b I4sapCXuotofe9YbiVGxIfZPUjvEB0ZgtNWI2lOb6QoJS5lqTfue9VMMITVfn9VfxJrSMF kS9ctxwPWWLlwPphE6AF79z1+JAZRatMw77C5eTz34S5dUuCUxMAwI80sKllc/elTToUIi 2JtHmnrprb3g6ErGUWFD80pG8tFQtca5uU1yOP/m3sp90vFbqYBpZBTfJYC2Zw== 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 4cGyzk6BRNz1QFl; Wed, 03 Sep 2025 10:10:42 +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 583AAglK006730; Wed, 3 Sep 2025 10:10:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583AAgDQ006727; Wed, 3 Sep 2025 10:10:42 GMT (envelope-from git) Date: Wed, 3 Sep 2025 10:10:42 GMT Message-Id: <202509031010.583AAgDQ006727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 512d3c3a2c63 - main - if_ovpn tests: skip float and linklocal test on < 2.7 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 512d3c3a2c6391cee61ff41e3fe6304973346857 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=512d3c3a2c6391cee61ff41e3fe6304973346857 commit 512d3c3a2c6391cee61ff41e3fe6304973346857 Author: Kristof Provost AuthorDate: 2025-08-29 09:19:26 +0000 Commit: Kristof Provost CommitDate: 2025-09-03 10:10:21 +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 --- 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 0281e7fc273d..9dafce2242d8 100644 --- a/tests/sys/net/if_ovpn/if_ovpn.sh +++ b/tests/sys/net/if_ovpn/if_ovpn.sh @@ -510,6 +510,7 @@ linklocal_head() linklocal_body() { ovpn_init + ovpn_check_version 2.7.0 l=$(vnet_mkepair) @@ -1399,6 +1400,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`