svn commit: r289739 - in head: etc/mtree usr.sbin/makefs usr.sbin/makefs/tests

[Garrett Cooper]

Author: ngie
Date: Thu Oct 22 05:32:45 2015
New Revision: 289739
URL: https://svnweb.freebsd.org/changeset/base/289739

Log:
  Correctly reintroduce the rudimentary smoke tests I botched up
  in r289684
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Added:
  head/usr.sbin/makefs/tests/
     - copied from r289694, head/usr.sbin/makefs/tests/
Modified:
  head/etc/mtree/BSD.tests.dist
  head/usr.sbin/makefs/Makefile

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Thu Oct 22 05:01:14 2015	(r289738)
+++ head/etc/mtree/BSD.tests.dist	Thu Oct 22 05:32:45 2015	(r289739)
@@ -596,6 +596,8 @@
         ..
         fstyp
         ..
+        makefs
+        ..
         newsyslog
         ..
         nmtree

Modified: head/usr.sbin/makefs/Makefile
==============================================================================
--- head/usr.sbin/makefs/Makefile	Thu Oct 22 05:01:14 2015	(r289738)
+++ head/usr.sbin/makefs/Makefile	Thu Oct 22 05:32:45 2015	(r289739)
@@ -1,5 +1,7 @@
 #	$FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	makefs
 
 CFLAGS+=-I${.CURDIR}
@@ -32,4 +34,8 @@ SRCS+=	ffs_tables.c
 CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
 LIBADD=		netbsd util sbuf
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>