D57148.id178315.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57148.id178315.diff
View Options

	diff --git a/tests/sys/kern/jaildesc.c b/tests/sys/kern/jaildesc.c
	--- a/tests/sys/kern/jaildesc.c
	+++ b/tests/sys/kern/jaildesc.c
	@@ -120,8 +120,7 @@
	error = pthread_create(&thr, NULL, poll_jaildesc, &jd);
	ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error));

	- /* Wait for the thread to block in poll(2). */
	- usleep(250000);
	+ wait_for_naptime(getpid(), "select");

	ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno));

	@@ -150,8 +149,7 @@
	error = pthread_create(&thr, NULL, poll_jaildesc, &jd);
	ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error));

	- /* Wait for the thread to block in poll(2). */
	- usleep(250000);
	+ wait_for_naptime(getpid(), "select");

	ATF_REQUIRE_MSG(jail_remove_jd(jd) == 0,
	"jail_remove_jd: %s", strerror(errno));
	@@ -219,8 +217,7 @@
	error = pthread_create(&thr, NULL, poll_jaildesc, &jd);
	ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error));

	- /* Wait for the thread to block in poll(2). */
	- usleep(250000);
	+ wait_for_naptime(getpid(), "select");

	ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno));

	@@ -324,7 +321,7 @@
	_exit(3);
	}

	- wait_child_nap(pid, "sigsusp");
	+ wait_for_naptime(pid, "sigsusp");

	error = close(jd);
	ATF_REQUIRE_MSG(error == 0, "close: %s", strerror(errno));