From owner-svn-src-projects@freebsd.org Mon Apr 1 23:37:23 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 060781571DCA for ; Mon, 1 Apr 2019 23:37:23 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9A48B8E314; Mon, 1 Apr 2019 23:37:22 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73A151DAD6; Mon, 1 Apr 2019 23:37:22 +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 x31NbMQQ039062; Mon, 1 Apr 2019 23:37:22 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x31NbM4m039061; Mon, 1 Apr 2019 23:37:22 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201904012337.x31NbM4m039061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 1 Apr 2019 23:37:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345788 - projects/fuse2/tests/sys/fs/fusefs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fusefs X-SVN-Commit-Revision: 345788 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9A48B8E314 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 01 Apr 2019 23:37:23 -0000 Author: asomers Date: Mon Apr 1 23:37:21 2019 New Revision: 345788 URL: https://svnweb.freebsd.org/changeset/base/345788 Log: Respond to ngie's comments in D19752 Better Makefile syntax. Note that this commit is to the project branch, but the review concerns the merge to head. Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fusefs/Makefile Modified: projects/fuse2/tests/sys/fs/fusefs/Makefile ============================================================================== --- projects/fuse2/tests/sys/fs/fusefs/Makefile Mon Apr 1 22:19:15 2019 (r345787) +++ projects/fuse2/tests/sys/fs/fusefs/Makefile Mon Apr 1 23:37:21 2019 (r345788) @@ -38,166 +38,24 @@ GTESTS+= unlink GTESTS+= write GTESTS+= xattr -SRCS.access+= access.cc -SRCS.access+= getmntopts.c -SRCS.access+= mockfs.cc -SRCS.access+= utils.cc +.for p in ${GTESTS} +SRCS.$p+= ${p}.cc +SRCS.$p+= getmntopts.c +SRCS.$p+= mockfs.cc +SRCS.$p+= utils.cc +.endfor -SRCS.allow_other+= allow_other.cc -SRCS.allow_other+= getmntopts.c -SRCS.allow_other+= mockfs.cc -SRCS.allow_other+= utils.cc - -SRCS.create+= create.cc -SRCS.create+= getmntopts.c -SRCS.create+= mockfs.cc -SRCS.create+= utils.cc - -SRCS.default_permissions+= default_permissions.cc -SRCS.default_permissions+= getmntopts.c -SRCS.default_permissions+= mockfs.cc -SRCS.default_permissions+= utils.cc TEST_METADATA.default_permissions+= required_user="unprivileged" - -SRCS.destroy+= destroy.cc -SRCS.destroy+= getmntopts.c -SRCS.destroy+= mockfs.cc -SRCS.destroy+= utils.cc - -SRCS.flush+= flush.cc -SRCS.flush+= getmntopts.c -SRCS.flush+= mockfs.cc -SRCS.flush+= utils.cc - -SRCS.fsync+= fsync.cc -SRCS.fsync+= getmntopts.c -SRCS.fsync+= mockfs.cc -SRCS.fsync+= utils.cc - -SRCS.fsyncdir+= fsyncdir.cc -SRCS.fsyncdir+= getmntopts.c -SRCS.fsyncdir+= mockfs.cc -SRCS.fsyncdir+= utils.cc - -SRCS.getattr+= getattr.cc -SRCS.getattr+= getmntopts.c -SRCS.getattr+= mockfs.cc -SRCS.getattr+= utils.cc - -SRCS.interrupt+= interrupt.cc -SRCS.interrupt+= getmntopts.c -SRCS.interrupt+= mockfs.cc -SRCS.interrupt+= utils.cc - -SRCS.link+= getmntopts.c -SRCS.link+= link.cc -SRCS.link+= mockfs.cc -SRCS.link+= utils.cc - -SRCS.locks+= locks.cc -SRCS.locks+= getmntopts.c -SRCS.locks+= mockfs.cc -SRCS.locks+= utils.cc - -SRCS.lookup+= getmntopts.c -SRCS.lookup+= lookup.cc -SRCS.lookup+= mockfs.cc -SRCS.lookup+= utils.cc - -SRCS.mkdir+= getmntopts.c -SRCS.mkdir+= mockfs.cc -SRCS.mkdir+= mkdir.cc -SRCS.mkdir+= utils.cc - -SRCS.mknod+= getmntopts.c -SRCS.mknod+= mockfs.cc -SRCS.mknod+= mknod.cc -SRCS.mknod+= utils.cc TEST_METADATA.mknod+= required_user="root" -SRCS.open+= getmntopts.c -SRCS.open+= mockfs.cc -SRCS.open+= open.cc -SRCS.open+= utils.cc - -SRCS.opendir+= getmntopts.c -SRCS.opendir+= mockfs.cc -SRCS.opendir+= opendir.cc -SRCS.opendir+= utils.cc - -SRCS.read+= getmntopts.c -SRCS.read+= mockfs.cc -SRCS.read+= read.cc -SRCS.read+= utils.cc - -SRCS.readdir+= getmntopts.c -SRCS.readdir+= mockfs.cc -SRCS.readdir+= readdir.cc -SRCS.readdir+= utils.cc - -SRCS.readlink+= getmntopts.c -SRCS.readlink+= mockfs.cc -SRCS.readlink+= readlink.cc -SRCS.readlink+= utils.cc - -SRCS.release+= getmntopts.c -SRCS.release+= mockfs.cc -SRCS.release+= release.cc -SRCS.release+= utils.cc - -SRCS.releasedir+= getmntopts.c -SRCS.releasedir+= mockfs.cc -SRCS.releasedir+= releasedir.cc -SRCS.releasedir+= utils.cc - -SRCS.rename+= getmntopts.c -SRCS.rename+= mockfs.cc -SRCS.rename+= rename.cc -SRCS.rename+= utils.cc - -SRCS.rmdir+= getmntopts.c -SRCS.rmdir+= mockfs.cc -SRCS.rmdir+= rmdir.cc -SRCS.rmdir+= utils.cc - -SRCS.setattr+= getmntopts.c -SRCS.setattr+= mockfs.cc -SRCS.setattr+= setattr.cc -SRCS.setattr+= utils.cc - -SRCS.statfs+= getmntopts.c -SRCS.statfs+= mockfs.cc -SRCS.statfs+= statfs.cc -SRCS.statfs+= utils.cc - -SRCS.symlink+= getmntopts.c -SRCS.symlink+= mockfs.cc -SRCS.symlink+= symlink.cc -SRCS.symlink+= utils.cc - -SRCS.unlink+= getmntopts.c -SRCS.unlink+= mockfs.cc -SRCS.unlink+= unlink.cc -SRCS.unlink+= utils.cc - -SRCS.write+= getmntopts.c -SRCS.write+= mockfs.cc -SRCS.write+= write.cc -SRCS.write+= utils.cc - -SRCS.xattr+= getmntopts.c -SRCS.xattr+= mockfs.cc -SRCS.xattr+= xattr.cc -SRCS.xattr+= utils.cc - # TODO: drastically increase timeout after test development is mostly complete TEST_METADATA+= timeout=10 -FUSEFS= ${.CURDIR:H:H:H:H}/sys/fs/fuse -MOUNT= ${.CURDIR:H:H:H:H}/sbin/mount -CFLAGS+= -I${.CURDIR:H:H:H} -CFLAGS+= -I${FUSEFS} -CFLAGS+= -I${MOUNT} +FUSEFS= ${SRCTOP}/sys/fs/fuse +MOUNT= ${SRCTOP}/sbin/mount +CXXFLAGS+= -I${SRCTOP}/tests +CXXFLAGS+= -I${FUSEFS} +CXXFLAGS+= -I${MOUNT} .PATH: ${MOUNT} CXXSTD= c++14