D52234.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52234.diff
View Options

	diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh
	--- a/tests/sys/net/if_ovpn/if_ovpn.sh
	+++ b/tests/sys/net/if_ovpn/if_ovpn.sh
	@@ -510,6 +510,7 @@
	linklocal_body()
	{
	ovpn_init
	+ ovpn_check_version 2.7.0

	l=$(vnet_mkepair)

	@@ -1399,6 +1400,7 @@
	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
	--- a/tests/sys/net/if_ovpn/utils.subr
	+++ b/tests/sys/net/if_ovpn/utils.subr
	@@ -40,6 +40,25 @@
	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`