D55222.id171676.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55222.id171676.diff
View Options

	diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile
	--- a/sbin/dhclient/tests/Makefile
	+++ b/sbin/dhclient/tests/Makefile
	@@ -4,6 +4,7 @@

	# Tests assign a common IP address.
	TEST_METADATA.pcp+= is_exclusive=true
	+TEST_METADATA.pcp+= required_programs="dhcpd"

	PLAIN_TESTS_C= option-domain-search_test
	SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \
	diff --git a/sbin/dhclient/tests/pcp.sh b/sbin/dhclient/tests/pcp.sh
	--- a/sbin/dhclient/tests/pcp.sh
	+++ b/sbin/dhclient/tests/pcp.sh
	@@ -59,10 +59,6 @@
	{
	dhcpd=$(which dhcpd)

	- if ! [ -x "$dhcpd" ]; then
	- atf_skip "ISC dhcp server (isc-dhcp44-server) not installed"
	- fi
	-
	vnet_init

	epair=$(vnet_mkepair)
	@@ -107,16 +103,13 @@
	{
	atf_set descr 'test dhclient on pcp interface'
	atf_set require.user root
	+ atf_set require.kmods 'ng_ether ng_iface ng_vlan'
	}

	pcp_body()
	{
	dhcpd=$(which dhcpd)

	- if ! [ -x "$dhcpd" ]; then
	- atf_skip "ISC dhcp server (isc-dhcp44-server) not installed"
	- fi
	-
	vnet_init

	epair=$(vnet_mkepair)
	@@ -124,11 +117,6 @@
	# Server side needs to be up to pass packets
	ifconfig ${epair}a up

	- # Make sure necessary netgraph modules are loaded
	- kldstat -q -n ng_ether \|\| kldload ng_ether
	- kldstat -q -n ng_iface \|\| kldload ng_iface
	- kldstat -q -n ng_vlan \|\| kldload ng_vlan
	-
	# create vlan, and attach epair to it (has incoming/outgoing vlan
	# 0 tagged frames)
	ngctl mkpeer ${epair}a: vlan lower downstream