From owner-svn-src-stable@freebsd.org  Thu Sep  3 19:42:58 2015
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 227AC9CA919;
 Thu,  3 Sep 2015 19:42:58 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 124B5DC0;
 Thu,  3 Sep 2015 19:42:58 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t83JgvJu023305;
 Thu, 3 Sep 2015 19:42:57 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t83JgvZo023303;
 Thu, 3 Sep 2015 19:42:57 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201509031942.t83JgvZo023303@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Thu, 3 Sep 2015 19:42:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r287441 - in stable/10: etc/mtree usr.sbin/fstyp
 usr.sbin/fstyp/tests
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Sep 2015 19:42:58 -0000

Author: asomers
Date: Thu Sep  3 19:42:56 2015
New Revision: 287441
URL: https://svnweb.freebsd.org/changeset/base/287441

Log:
  MFC r286964
  
  Add ATF functional tests for fstyp(8).  No ZFS or GELI tests yet.

Added:
  stable/10/usr.sbin/fstyp/tests/
     - copied from r286964, head/usr.sbin/fstyp/tests/
Modified:
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/usr.sbin/fstyp/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Thu Sep  3 18:27:39 2015	(r287440)
+++ stable/10/etc/mtree/BSD.tests.dist	Thu Sep  3 19:42:56 2015	(r287441)
@@ -388,6 +388,8 @@
     usr.sbin
         etcupdate
         ..
+        fstyp
+        ..
         newsyslog
         ..
         nmtree

Modified: stable/10/usr.sbin/fstyp/Makefile
==============================================================================
--- stable/10/usr.sbin/fstyp/Makefile	Thu Sep  3 18:27:39 2015	(r287440)
+++ stable/10/usr.sbin/fstyp/Makefile	Thu Sep  3 19:42:56 2015	(r287441)
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	fstyp
 SRCS=	fstyp.c ext2fs.c cd9660.c msdosfs.c ntfs.c ufs.c
 MAN=	fstyp.8
 
 WARNS=	6
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>