From c819c4670be35934fd18f9c1d436f8e028fde09a Mon Sep 17 00:00:00 2001 From: asomers Date: Mon, 31 Jul 2017 22:28:33 +0000 Subject: [PATCH] MFC r320165-r320166 r320165: devd(8): Remove pidfile on shutdown Sponsored by: Spectra Logic Corp r320166: Require devd to be running for its ATF tests to run The ATF tests communicate with the system's running devd PR: 220169 Reported by: gjb Sponsored by: Spectra Logic Corp git-svn-id: svn://svn.freebsd.org/base/stable/10@321827 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sbin/devd/devd.cc | 1 + sbin/devd/tests/Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 96ed18430..346eae2a0 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -1070,6 +1070,7 @@ event_loop(void) if (FD_ISSET(seqpacket_fd, &fds)) new_client(seqpacket_fd, SOCK_SEQPACKET); } + cfg.remove_pidfile(); close(seqpacket_fd); close(stream_fd); close(fd); diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile index e06928c55..c0a346f94 100644 --- a/sbin/devd/tests/Makefile +++ b/sbin/devd/tests/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ ATF_TESTS_C= client_test -TEST_METADATA.client_test= required_programs="devd" +TEST_METADATA.client_test= required_files="/var/run/devd.pid" +TEST_METADATA.client_test+= required_programs="devd" TEST_METADATA.client_test+= required_user="root" TEST_METADATA.client_test+= timeout=15 -- 2.45.0