D59227.id185232.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D59227.id185232.diff
View Options

	diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
	--- a/tests/sys/kern/Makefile
	+++ b/tests/sys/kern/Makefile
	@@ -159,6 +159,7 @@
	CFLAGS.pdwait+= -I${SRCTOP}/tests
	CFLAGS.procdesc+= -I${SRCTOP}/tests
	CFLAGS.ptrace_test+= -I${SRCTOP}/tests
	+CFLAGS.unix_connectat+= -I${SRCTOP}/tests

	WARNS?= 3

	diff --git a/tests/sys/kern/unix_connectat.c b/tests/sys/kern/unix_connectat.c
	--- a/tests/sys/kern/unix_connectat.c
	+++ b/tests/sys/kern/unix_connectat.c
	@@ -72,6 +72,8 @@

	#include <atf-c.h>

	+#include "freebsd_test_suite/macros.h"
	+
	/* An AF_UNIX address with an empty path: "the fd is the peer". */
	static const struct sockaddr_un empty_sun = {
	.sun_family = AF_UNIX,
	@@ -137,6 +139,8 @@
	char errmsg[1024];
	int error, iovlen;

	+ ATF_REQUIRE_KERNEL_MODULE("fdescfs");
	+
	ATF_REQUIRE_MSG(mkdir(FDDIR, 0755) == 0 \|\| errno == EEXIST,
	"mkdir %s: %s", FDDIR, strerror(errno));

	@@ -154,8 +158,6 @@

	errmsg[0] = '\0';
	error = nmount(iov, iovlen, 0);
	- if (error != 0 && errno == ENODEV)
	- atf_tc_skip("no fdescfs support in the kernel");
	ATF_REQUIRE_MSG(error == 0, "mount fdescfs on %s: %s", FDDIR,
	errmsg[0] != '\0' ? errmsg : strerror(errno));