svn commit: r305016 - head/cddl/usr.sbin/zfsd/tests

[Dimitry Andric]

Author: dim
Date: Mon Aug 29 18:55:06 2016
New Revision: 305016
URL: https://svnweb.freebsd.org/changeset/base/305016

Log:
  Fix the zfsd unittest:
  * TESTSDIR is supposed to be under cddl/usr.sbin, not cddl/sbin
  * DevdCtl::EventBuffer no longer exists, so remove its forward
    declaration
  
  MFC after:	3 days
  X-MFC-With:	r305013

Modified:
  head/cddl/usr.sbin/zfsd/tests/Makefile
  head/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc

Modified: head/cddl/usr.sbin/zfsd/tests/Makefile
==============================================================================
--- head/cddl/usr.sbin/zfsd/tests/Makefile	Mon Aug 29 18:53:51 2016	(r305015)
+++ head/cddl/usr.sbin/zfsd/tests/Makefile	Mon Aug 29 18:55:06 2016	(r305016)
@@ -4,7 +4,7 @@ SRCDIR=${.CURDIR}/../../../..
 .include "${.CURDIR}/../Makefile.common"
 .PATH:	${.CURDIR}/..
 
-TESTSDIR?=	${TESTSBASE}/cddl/sbin/zfsd
+TESTSDIR?=	${TESTSBASE}/cddl/usr.sbin/zfsd
 
 PLAIN_TESTS_CXX=	zfsd_unittest
 SRCS.zfsd_unittest:=		${SRCS:Nzfsd_main.cc}

Modified: head/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
==============================================================================
--- head/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc	Mon Aug 29 18:53:51 2016	(r305015)
+++ head/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc	Mon Aug 29 18:55:06 2016	(r305016)
@@ -72,7 +72,6 @@ using std::string;
 using std::stringstream;
 
 using DevdCtl::Event;
-using DevdCtl::EventBuffer;
 using DevdCtl::EventFactory;
 using DevdCtl::EventList;
 using DevdCtl::Guid;