Date: Mon, 31 Jul 2017 22:28:33 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r321827 - in stable/10/sbin/devd: . tests Message-ID: <201707312228.v6VMSXcx073206@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Mon Jul 31 22:28:33 2017 New Revision: 321827 URL: https://svnweb.freebsd.org/changeset/base/321827 Log: 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 Modified: stable/10/sbin/devd/devd.cc stable/10/sbin/devd/tests/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/devd/devd.cc ============================================================================== --- stable/10/sbin/devd/devd.cc Mon Jul 31 22:26:30 2017 (r321826) +++ stable/10/sbin/devd/devd.cc Mon Jul 31 22:28:33 2017 (r321827) @@ -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); Modified: stable/10/sbin/devd/tests/Makefile ============================================================================== --- stable/10/sbin/devd/tests/Makefile Mon Jul 31 22:26:30 2017 (r321826) +++ stable/10/sbin/devd/tests/Makefile Mon Jul 31 22:28:33 2017 (r321827) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707312228.v6VMSXcx073206>