Add ATF to the build. This is may be a bit rought around the egdes,

but committing it helps to get everyone on the same page and makes
sure we make progress.

Tinderbox breakages that are the result of this commit are entirely
the committer's fault -- in other words: buildworld testing on amd64
only.

Credits follow:

Submitted by:	Garrett Cooper <yanegomi@gmail.com>
Sponsored by:	Isilon Systems
Based on work by:	keramida@
Thanks to:	gnn@, mdf@, mlaier@, sjg@
Special thanks to:	keramida@

9 files changed, 90 insertions, 0 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 48124b9..bbb5018 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -198,6 +198,9 @@ distribution:
 .endif
 	pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 	    ${DESTDIR}/etc/master.passwd
+.if ${MK_ATF} != "no"
+	${_+_}cd ${.CURDIR}/atf; ${MAKE} install
+.endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
diff --git a/etc/atf/FreeBSD.conf b/etc/atf/FreeBSD.conf
new file mode 100644
index 0000000..23c1fa1
--- /dev/null
+++ b/etc/atf/FreeBSD.conf
@@ -0,0 +1,12 @@
+# $FreeBSD$
+Content-Type: application/X-atf-config; version="1"
+
+#
+# Configuration file for the FreeBSD test suite.
+#
+# See atf-formats(5) for details on the syntax of this file and tests(7) for
+# details on the FreeBSD test suite.
+#
+
+#variable1 = value1
+#variable2 = value2
diff --git a/etc/atf/Makefile b/etc/atf/Makefile
new file mode 100644
index 0000000..5eaa830
--- /dev/null
+++ b/etc/atf/Makefile
@@ -0,0 +1,39 @@
+#-
+# Copyright (c) 2011 Google, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+ATF=		${.CURDIR}/../../contrib/atf
+
+.PATH:		${ATF}/atf-run/sample
+
+NO_OBJ=
+
+FILESGROUPS=	ETC
+
+ETCDIR=		/etc/atf
+ETC=		FreeBSD.conf atf-run.hooks common.conf
+
+.include <bsd.prog.mk>
diff --git a/etc/atf/common.conf b/etc/atf/common.conf
new file mode 100644
index 0000000..2ac08da
--- /dev/null
+++ b/etc/atf/common.conf
@@ -0,0 +1,12 @@
+# $FreeBSD$
+Content-Type: application/X-atf-config; version="1"
+
+#
+# Sample configuration file for properties affecting all test suites.
+#
+
+# When running the test suite as root, some tests require to switch to
+# an unprivileged user to perform extra checks.  Set this variable to
+# the user you want to use in those cases.  If not set, those tests will
+# be skipped.
+unprivileged-user = "_atf"
diff --git a/etc/group b/etc/group
index 54d5c59..79e5360 100644
--- a/etc/group
+++ b/etc/group
@@ -16,6 +16,7 @@ staff:*:20:
 sshd:*:22:
 smmsp:*:25:
 mailnull:*:26:
+_atf:*:27:
 guest:*:31:
 bind:*:53:
 proxy:*:62:
diff --git a/etc/master.passwd b/etc/master.passwd
index 02163ef..4e1d113 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -13,6 +13,7 @@ man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
 sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
 smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
 mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
+_atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin
 bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
 proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
 _pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 81f0e5b..4a4deee 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -9,6 +9,10 @@
     ..
     arpa
     ..
+    atf-c
+    ..
+    atf-c++
+    ..
     bsm
     ..
     bsnmp
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index a6cba24..352ac21 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -24,6 +24,8 @@
     etc
         X11
         ..
+        atf
+        ..
         bluetooth
         ..
         defaults
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 9ff82d5..336d055 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -58,6 +58,8 @@
     sbin
     ..
     share
+        atf
+        ..
         calendar
             de_DE.ISO8859-1
             ..
@@ -77,6 +79,8 @@
         doc
             IPv6
             ..
+            atf
+            ..
             atm
             ..
             bind9
@@ -211,6 +215,8 @@
             ..
             IPv6
             ..
+            atf
+            ..
             bootforth
             ..
             csh
@@ -1324,6 +1330,14 @@
             catalog
             ..
         ..
+        xml
+            atf
+            ..
+        ..
+        xsl
+            atf
+            ..
+        ..
         zoneinfo
             Africa
             ..
@@ -1361,4 +1375,6 @@
     ..
     src             nochange
     ..
+    tests
+    ..
 ..