Date: Mon, 29 Aug 2016 19:14:52 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r305021 - in projects/netbsd-tests-update-12: cddl/usr.sbin/zfsd cddl/usr.sbin/zfsd/tests lib/libc/aarch64/sys Message-ID: <201608291914.u7TJEqF1069129@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Aug 29 19:14:52 2016 New Revision: 305021 URL: https://svnweb.freebsd.org/changeset/base/305021 Log: MFhead @ r305020 Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile.common projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/Makefile projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc projects/netbsd-tests-update-12/lib/libc/aarch64/sys/Makefile.inc Directory Properties: projects/netbsd-tests-update-12/ (props changed) projects/netbsd-tests-update-12/cddl/ (props changed) Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile ============================================================================== --- projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile Mon Aug 29 19:10:58 2016 (r305020) +++ projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile Mon Aug 29 19:14:52 2016 (r305021) @@ -1,6 +1,5 @@ # $FreeBSD$ -SRCDIR=${.CURDIR}/../../.. .include "Makefile.common" PROG_CXX= zfsd Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile.common ============================================================================== --- projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile.common Mon Aug 29 19:10:58 2016 (r305020) +++ projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile.common Mon Aug 29 19:14:52 2016 (r305021) @@ -15,20 +15,20 @@ WARNS?= 3 # Ignore warnings about Solaris specific pragmas. IGNORE_PRAGMA= YES -INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common -INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include -INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem -INCFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris -INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head -INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common -INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libumem/common -INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs_core/common -INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common -INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair -INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs -INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common -INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs -INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys +INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +INCFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head +INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common +INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common +INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS} Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/Makefile ============================================================================== --- projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/Makefile Mon Aug 29 19:10:58 2016 (r305020) +++ projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/Makefile Mon Aug 29 19:14:52 2016 (r305021) @@ -1,10 +1,7 @@ # $FreeBSD$ -SRCDIR=${.CURDIR}/../../../.. .include "${.CURDIR}/../Makefile.common" -.PATH: ${.CURDIR}/.. - -TESTSDIR?= ${TESTSBASE}/cddl/sbin/zfsd +.PATH: ${.CURDIR:H} PLAIN_TESTS_CXX= zfsd_unittest SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc} @@ -12,7 +9,7 @@ SRCS.zfsd_unittest+= libmocks.c zfsd_un SRCS= # Use #include <zfsd/xxx.h> in test programs. -INCFLAGS+= -I${.CURDIR}/../.. +INCFLAGS+= -I${.CURDIR:H:H} .if defined(DESTDIR) INCFLAGS+= -I${DESTDIR}/usr/include @@ -27,7 +24,6 @@ LIBRARY_PATH= .endif # Googletest options -LOCALBASE?= /usr/local 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 @@ -39,7 +35,4 @@ LDADD.zfsd_unittest+= ${LOCALBASE}/lib/l # https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J CFLAGS.zfsd_unittest+= -DGTEST_HAS_PTHREAD -# Install the tests -TESTSBASE?= /usr/tests - .include <bsd.test.mk> Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc ============================================================================== --- projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc Mon Aug 29 19:10:58 2016 (r305020) +++ projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc Mon Aug 29 19:14:52 2016 (r305021) @@ -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; Modified: projects/netbsd-tests-update-12/lib/libc/aarch64/sys/Makefile.inc ============================================================================== --- projects/netbsd-tests-update-12/lib/libc/aarch64/sys/Makefile.inc Mon Aug 29 19:10:58 2016 (r305020) +++ projects/netbsd-tests-update-12/lib/libc/aarch64/sys/Makefile.inc Mon Aug 29 19:14:52 2016 (r305021) @@ -4,7 +4,6 @@ MIASM:= ${MIASM:Nfreebsd[467]_*} SRCS+= __vdso_gettc.c -#MDASM= ptrace.S MDASM= cerror.S \ shmat.S \ sigreturn.S \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608291914.u7TJEqF1069129>