From owner-svn-src-projects@freebsd.org Wed May 25 20:11:27 2016 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 DE8F7B49A99 for ; Wed, 25 May 2016 20:11:27 +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 9FF881D35; Wed, 25 May 2016 20:11:27 +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 u4PKBQfJ063560; Wed, 25 May 2016 20:11:26 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4PKBQ06063559; Wed, 25 May 2016 20:11:26 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201605252011.u4PKBQ06063559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 25 May 2016 20:11:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r300695 - projects/zfsd/head/cddl/usr.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.22 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, 25 May 2016 20:11:28 -0000 Author: asomers Date: Wed May 25 20:11:26 2016 New Revision: 300695 URL: https://svnweb.freebsd.org/changeset/base/300695 Log: Convert the zfsd unittests from an ATF test to a plain test This abandons the gcov integration, but that doesn't work with clang anyway. There's no reduction in the granularity of test visibility to Kyua, because the entire file was a single test from the perspective of ATF. Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/cddl/usr.sbin/zfsd/tests/zfsd_test.sh Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/tests/Makefile Modified: projects/zfsd/head/cddl/usr.sbin/zfsd/tests/Makefile ============================================================================== --- projects/zfsd/head/cddl/usr.sbin/zfsd/tests/Makefile Wed May 25 19:44:26 2016 (r300694) +++ projects/zfsd/head/cddl/usr.sbin/zfsd/tests/Makefile Wed May 25 20:11:26 2016 (r300695) @@ -4,45 +4,42 @@ SRCDIR=${.CURDIR}/../../../.. .include "${.CURDIR}/../Makefile.common" .PATH: ${.CURDIR}/.. -PROG_CXX= zfsd_unittest -SRCS:= ${SRCS:Nzfsd_main.cc} -SRCS+= libmocks.c zfsd_unittest.cc +TESTSDIR?= ${TESTSBASE}/cddl/sbin/zfsd + +PLAIN_TESTS_CXX= zfsd_unittest +SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} +SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc +SRCS= # Use #include in test programs. -INCFLAGS+= -I ${.CURDIR}/../.. +INCFLAGS+= -I${.CURDIR}/../.. .if defined(DESTDIR) -INCFLAGS+= -I ${DESTDIR}/usr/include +INCFLAGS+= -I${DESTDIR}/usr/include LIBRARY_PATH= ${DESTDIR}/lib:${DESTDIR}/usr/lib -LDFLAGS+= -L ${DESTDIR}/lib -L ${DESTDIR}/usr/lib +LDFLAGS.zfsd_unittest+= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib .elif defined(WORLDTMP) -INCFLAGS+= -I ${WORLDTMP}/usr/include +INCFLAGS+= -I${WORLDTMP}/usr/include LIBRARY_PATH= ${WORLDTMP}/lib:${WORLDTMP}/usr/lib -LDFLAGS+= -L ${WORLDTMP}/lib -L ${WORLDTMP}/usr/lib +LDFLAGS.zfsd_unittest+= -L${WORLDTMP}/lib -L${WORLDTMP}/usr/lib .else LIBRARY_PATH= .endif -ZFSD_UNITTEST= env LD_LIBRARY_PATH=${LIBRARY_PATH} ./zfsd_unittest # Googletest options LOCALBASE?= /usr/local -INCFLAGS+= -I ${LOCALBASE}/include -D_THREAD_SAFE -pthread -LDFLAGS+= -L ${LOCALBASE}/lib -D_THREAD_SAFE -pthread -LDADD+= ${LOCALBASE}/lib/libgtest.a +INCFLAGS+= -I${LOCALBASE}/include -D_THREAD_SAFE -pthread +LDFLAGS.zfsd_unittest+= -L${LOCALBASE}/lib -D_THREAD_SAFE -pthread +LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgtest.a # GoogleMock options -LDADD+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main.a +LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main.a # Googlemock fails if we don't have this line # https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J -CFLAGS+= -DGTEST_HAS_PTHREAD +CFLAGS.zfsd_unittest+= -DGTEST_HAS_PTHREAD # Install the tests TESTSBASE?= /usr/tests -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 -BINDIR= ${TESTSDIR} .include