From owner-svn-src-projects@freebsd.org Wed Dec 16 21:58:50 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09C1AA49664 for ; Wed, 16 Dec 2015 21:58:50 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CBE951C65; Wed, 16 Dec 2015 21:58:49 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBGLwmQX090069; Wed, 16 Dec 2015 21:58:48 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGLwmnr090067; Wed, 16 Dec 2015 21:58:48 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512162158.tBGLwmnr090067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 21:58:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292377 - in projects/zfsd/head/cddl/sbin/zfsd: . tests X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2015 21:58:50 -0000 Author: asomers Date: Wed Dec 16 21:58:48 2015 New Revision: 292377 URL: https://svnweb.freebsd.org/changeset/base/292377 Log: Minor zfsd(8) fixes cddl/sbin/zfsd/case_file.cc Add comment cddl/sbin/zfsd/tests/Makefile Allow TESTSDIR to be overridden Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc projects/zfsd/head/cddl/sbin/zfsd/tests/Makefile Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Wed Dec 16 21:52:36 2015 (r292376) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Wed Dec 16 21:58:48 2015 (r292377) @@ -804,6 +804,7 @@ CaseFile::SerializeEvList(const EventLis curEvent != events.end(); curEvent++) { const string &eventString((*curEvent)->GetEventString()); + // TODO: replace many write(2) calls with a single writev(2) if (prefix) write(fd, prefix, strlen(prefix)); write(fd, eventString.c_str(), eventString.length()); Modified: projects/zfsd/head/cddl/sbin/zfsd/tests/Makefile ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/tests/Makefile Wed Dec 16 21:52:36 2015 (r292376) +++ projects/zfsd/head/cddl/sbin/zfsd/tests/Makefile Wed Dec 16 21:58:48 2015 (r292377) @@ -39,7 +39,7 @@ CFLAGS+= -DGTEST_HAS_PTHREAD # Install the tests TESTSBASE?= /usr/tests -TESTSDIR= ${TESTSBASE}/cddl/sbin/zfsd +TESTSDIR?= ${TESTSBASE}/cddl/sbin/zfsd # TODO: Convert from an ATF SH test to a Kyua plain test # Long term TODO: Convert to a Kyua googletest test ATF_TESTS_SH+= zfsd_test