svn commit: r283846 - in stable/10: etc etc/mtree etc/tests tests tests/etc

[Garrett Cooper]

Author: ngie
Date: Sun May 31 22:39:48 2015
New Revision: 283846
URL: https://svnweb.freebsd.org/changeset/base/283846

Log:
  MFC r277627,r277650,r282059,r283056,r283840,r283845:
  
  r277627 (by will):
  
  Add routing_test:static_ipv6_loopback_route_for_each_fib.
  It tests that all FIBs get a static IPv6 loopback route.
  
  Submitted by:	asomers
  Sponsored by:	Spectra Logic
  MFSpectraBSD:	1048456 on 2014/03/13
  		1114523 on 2015/01/23
  
  r277650 (by will):
  
  Add tests/etc/rc.d to mtree.
  
  Submitted by:	stefanf
  MFC with:	277627
  
  r282059:
  
  Move etc/tests/rc.d to etc/rc.d/tests to match the directory layout jmmv@
  documented and implemented in other areas of the FreeBSD tree
  
  r283056:
  
  Move all test integration pieces for etc/ from etc/ to tests/
  
  This is being done to fix breakage with make distribution with read-only
  source trees as make distribution doesn't use make obj like building
  tests/ does in all cases
  
  Reported by: Wolfgang Zenker <wolfgang at lyxys.ka.sub.org>
  Suggested by: jhb
  
  r283840:
  
  Remove empty tests directory
  
  r283845:
  
  Append to SUBDIR, not set it
  
  Pointyhat to: ngie

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

Modified: stable/10/etc/Makefile
==============================================================================
--- stable/10/etc/Makefile	Sun May 31 22:24:29 2015	(r283845)
+++ stable/10/etc/Makefile	Sun May 31 22:39:48 2015	(r283846)
@@ -10,10 +10,6 @@ SUBDIR=	\
 SUBDIR+=sendmail
 .endif
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
-
 BIN1=	crontab \
 	devd.conf \
 	devfs.conf \

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Sun May 31 22:24:29 2015	(r283845)
+++ stable/10/etc/mtree/BSD.tests.dist	Sun May 31 22:39:48 2015	(r283846)
@@ -50,6 +50,8 @@
         ..
     ..
     etc
+        rc.d
+        ..
     ..
     games
     ..

Modified: stable/10/tests/Makefile
==============================================================================
--- stable/10/tests/Makefile	Sun May 31 22:24:29 2015	(r283845)
+++ stable/10/tests/Makefile	Sun May 31 22:39:48 2015	(r283846)
@@ -2,7 +2,8 @@
 
 .include <bsd.own.mk>
 
-SUBDIR= sys
+SUBDIR+= etc
+SUBDIR+= sys
 
 TESTSDIR= ${TESTSBASE}
 KYUAFILE= yes