svn commit: r260024 - in stable/10: . etc etc/mtree lib/atf lib/atf/libatf-c lib/atf/libatf-c++ lib/atf/libatf-c++/tests lib/atf/libatf-c/tests lib/atf/tests lib/atf/tests/test-programs libexec lib...

Julio Merino jmmv at FreeBSD.org
Sat Dec 28 23:09:03 UTC 2013


Author: jmmv
Date: Sat Dec 28 23:08:58 2013
New Revision: 260024
URL: http://svnweb.freebsd.org/changeset/base/260024

Log:
  Plug the ATF tests into the build.
  
  This is a MFC into stable/10 of:
  - r257849 Add libatf-c++ to the prebuild libs.
  - r257853 Build and install the atf tests.
  - r258233 Move all atf directories to the tests mtree.
  - r258285 Fix the build of some ATF tests.
  
  This change is "make tinderbox" clean on ref10-amd64 with the default
  settings of WITHOUT_TESTS.  It is likely for the WITH_TESTS build to
  still be broken because not all relevant changes have been merged yet.

Added:
  stable/10/lib/atf/libatf-c++/Makefile.inc
     - copied unchanged from r257853, head/lib/atf/libatf-c++/Makefile.inc
  stable/10/lib/atf/libatf-c++/tests/
     - copied from r257853, head/lib/atf/libatf-c++/tests/
  stable/10/lib/atf/libatf-c/Makefile.inc
     - copied unchanged from r257853, head/lib/atf/libatf-c/Makefile.inc
  stable/10/lib/atf/libatf-c/tests/
     - copied from r257853, head/lib/atf/libatf-c/tests/
  stable/10/lib/atf/tests/
     - copied from r257853, head/lib/atf/tests/
  stable/10/libexec/atf/atf-check/Makefile.inc
     - copied unchanged from r257853, head/libexec/atf/atf-check/Makefile.inc
  stable/10/libexec/atf/atf-check/tests/
     - copied from r257853, head/libexec/atf/atf-check/tests/
  stable/10/libexec/atf/tests/
     - copied from r257853, head/libexec/atf/tests/
  stable/10/libexec/tests/
     - copied from r257853, head/libexec/tests/
  stable/10/usr.bin/atf/atf-sh/tests/
     - copied from r257853, head/usr.bin/atf/atf-sh/tests/
  stable/10/usr.bin/atf/tests/
     - copied from r257853, head/usr.bin/atf/tests/
  stable/10/usr.bin/tests/
     - copied from r257853, head/usr.bin/tests/
Modified:
  stable/10/Makefile.inc1
  stable/10/etc/Makefile
  stable/10/etc/mtree/BSD.include.dist
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/etc/mtree/BSD.usr.dist
  stable/10/lib/atf/Makefile
  stable/10/lib/atf/Makefile.inc
  stable/10/lib/atf/libatf-c++/Makefile
  stable/10/lib/atf/libatf-c++/tests/Makefile
  stable/10/lib/atf/libatf-c/Makefile
  stable/10/lib/atf/libatf-c/tests/Makefile
  stable/10/lib/atf/tests/test-programs/Makefile
  stable/10/libexec/Makefile
  stable/10/libexec/atf/Makefile
  stable/10/libexec/atf/Makefile.inc
  stable/10/libexec/atf/atf-check/Makefile
  stable/10/usr.bin/Makefile
  stable/10/usr.bin/atf/Makefile
  stable/10/usr.bin/atf/Makefile.inc
  stable/10/usr.bin/atf/atf-sh/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/Makefile.inc1	Sat Dec 28 23:08:58 2013	(r260024)
@@ -494,7 +494,7 @@ _worldtmp:
 .endif
 .if ${MK_TESTS} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${WORLDTMP}${TESTSBASE} >/dev/null
+	    -p ${WORLDTMP}/usr >/dev/null
 .endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
@@ -1480,7 +1480,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
-		${_lib_atf_libatf_c} \
+		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
@@ -1495,7 +1495,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
 .if ${MK_TESTS} != "no"
-_lib_atf_libatf_c=	lib/atf/libatf-c
+_lib_atf=	lib/atf
 .endif
 
 .if ${MK_LIBTHR} != "no"

Modified: stable/10/etc/Makefile
==============================================================================
--- stable/10/etc/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/etc/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -321,7 +321,7 @@ MTREES+=	mtree/BSD.debug.dist		/usr/lib
 MTREES+=	mtree/BSD.groff.dist		/usr
 .endif
 .if ${MK_TESTS} != "no"
-MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
+MTREES+=	mtree/BSD.tests.dist		/usr
 .endif
 .if ${MK_SENDMAIL} != "no"
 MTREES+=	mtree/BSD.sendmail.dist		/

Modified: stable/10/etc/mtree/BSD.include.dist
==============================================================================
--- stable/10/etc/mtree/BSD.include.dist	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/etc/mtree/BSD.include.dist	Sat Dec 28 23:08:58 2013	(r260024)
@@ -9,10 +9,6 @@
     ..
     arpa
     ..
-    atf-c
-    ..
-    atf-c++
-    ..
     bsm
     ..
     bsnmp

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/etc/mtree/BSD.tests.dist	Sat Dec 28 23:08:58 2013	(r260024)
@@ -5,8 +5,44 @@
 
 /set type=dir uname=root gname=wheel mode=0755
 .
-    lib
-        libcrypt
+    include
+        atf-c
+        ..
+        atf-c++
+        ..
+    ..
+    share
+        atf
+        ..
+        doc
+            atf
+            ..
+        ..
+    ..
+    tests
+        lib
+            atf
+                libatf-c
+                ..
+                libatf-c++
+                ..
+                test-programs
+                ..
+            ..
+            libcrypt
+            ..
+        ..
+        libexec
+            atf
+                atf-check
+                ..
+            ..
+        ..
+        usr.bin
+            atf
+                atf-sh
+                ..
+            ..
         ..
     ..
 ..

Modified: stable/10/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/10/etc/mtree/BSD.usr.dist	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/etc/mtree/BSD.usr.dist	Sat Dec 28 23:08:58 2013	(r260024)
@@ -120,8 +120,6 @@
     sbin
     ..
     share
-        atf
-        ..
         bsdconfig
             media
             ..
@@ -165,8 +163,6 @@
         doc
             IPv6
             ..
-            atf
-            ..
             atm
             ..
             legal
@@ -1447,6 +1443,4 @@
     ..
     src             nochange
     ..
-    tests
-    ..
 ..

Modified: stable/10/lib/atf/Makefile
==============================================================================
--- stable/10/lib/atf/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/lib/atf/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -27,9 +27,13 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=		\
-		libatf-c \
-		libatf-c++
+SUBDIR=		libatf-c \
+		libatf-c++ \
+                ${_tests}
+
+.if ${MK_TESTS} != "no"
+_tests= 	tests
+.endif
 
 .ORDER: ${SUBDIR}
 

Modified: stable/10/lib/atf/Makefile.inc
==============================================================================
--- stable/10/lib/atf/Makefile.inc	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/lib/atf/Makefile.inc	Sat Dec 28 23:08:58 2013	(r260024)
@@ -25,8 +25,6 @@
 #
 # $FreeBSD$
 
-ATF=		${.CURDIR}/../../../contrib/atf
-
 _CFLAGS:=	${CFLAGS}
 _CPPFLAGS:=	${CPPFLAGS}
 _CXXFLAGS:=	${CXXFLAGS}

Modified: stable/10/lib/atf/libatf-c++/Makefile
==============================================================================
--- stable/10/lib/atf/libatf-c++/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/lib/atf/libatf-c++/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -36,6 +36,7 @@ LDADD=		-latf-c
 
 LDFLAGS+=	-L${.OBJDIR}/../libatf-c
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c++
 .PATH:		${ATF}/atf-c++/detail
@@ -73,4 +74,8 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
 
 MAN=		atf-c++-api.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR=		tests
+.endif
+
 .include <bsd.lib.mk>

Copied: stable/10/lib/atf/libatf-c++/Makefile.inc (from r257853, head/lib/atf/libatf-c++/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/atf/libatf-c++/Makefile.inc	Sat Dec 28 23:08:58 2013	(r260024, copy of r257853, head/lib/atf/libatf-c++/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: stable/10/lib/atf/libatf-c++/tests/Makefile
==============================================================================
--- head/lib/atf/libatf-c++/tests/Makefile	Fri Nov  8 14:33:41 2013	(r257853)
+++ stable/10/lib/atf/libatf-c++/tests/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -23,7 +23,7 @@ FILES+=		unused_test.cpp
 		tests_test \
 		utils_test
 ATF_TESTS_CXX+=	${_T}
-SRCS_${_T}=	${_T}.cpp test_helpers.cpp
+SRCS.${_T}=	${_T}.cpp test_helpers.cpp
 .endfor
 
 ATF_TESTS_SH=	pkg_config_test
@@ -41,7 +41,7 @@ ATF_TESTS_SH=	pkg_config_test
 		text_test \
 		ui_test
 ATF_TESTS_CXX+=	${_T}
-SRCS_${_T}=	${_T}.cpp test_helpers.cpp
+SRCS.${_T}=	${_T}.cpp test_helpers.cpp
 .endfor
 
 .include <atf.test.mk>

Modified: stable/10/lib/atf/libatf-c/Makefile
==============================================================================
--- stable/10/lib/atf/libatf-c/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/lib/atf/libatf-c/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -30,6 +30,7 @@
 LIB=		atf-c
 SHLIB_MAJOR=	1
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
@@ -73,4 +74,8 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
 
 MAN=		atf-c-api.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR=		tests
+.endif
+
 .include <bsd.lib.mk>

Copied: stable/10/lib/atf/libatf-c/Makefile.inc (from r257853, head/lib/atf/libatf-c/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/lib/atf/libatf-c/Makefile.inc	Sat Dec 28 23:08:58 2013	(r260024, copy of r257853, head/lib/atf/libatf-c/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: stable/10/lib/atf/libatf-c/tests/Makefile
==============================================================================
--- head/lib/atf/libatf-c/tests/Makefile	Fri Nov  8 14:33:41 2013	(r257853)
+++ stable/10/lib/atf/libatf-c/tests/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -33,7 +33,7 @@ FILES+=		unused_test.c
 		tp_test \
 		utils_test
 ATF_TESTS_C+=	${_T}
-SRCS_${_T}=	${_T}.c test_helpers.c
+SRCS.${_T}=	${_T}.c test_helpers.c
 .endfor
 
 ATF_TESTS_SH=	pkg_config_test
@@ -51,12 +51,12 @@ ATF_TESTS_SH=	pkg_config_test
 		text_test \
 		user_test
 ATF_TESTS_C+=	${_T}
-SRCS_${_T}=	${_T}.c test_helpers.c
+SRCS.${_T}=	${_T}.c test_helpers.c
 .endfor
 
 PROGS+=		process_helpers
-SRCS_process_helpers=	process_helpers.c
-MAN_process_helpers=	# defined
-BINDIR_process_helpers=	${TESTSDIR}
+SRCS.process_helpers=	process_helpers.c
+MAN.process_helpers=	# defined
+BINDIR.process_helpers=	${TESTSDIR}
 
 .include <atf.test.mk>

Modified: stable/10/lib/atf/tests/test-programs/Makefile
==============================================================================
--- head/lib/atf/tests/test-programs/Makefile	Fri Nov  8 14:33:41 2013	(r257853)
+++ stable/10/lib/atf/tests/test-programs/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -13,7 +13,7 @@ CFLAGS+=	-I${ATF}
 ATF_TESTS_C=		c_helpers
 
 ATF_TESTS_CXX=		cpp_helpers
-SRCS_cpp_helpers=	cpp_helpers.cpp
+SRCS.cpp_helpers=	cpp_helpers.cpp
 
 ATF_TESTS_SH=		sh_helpers
 .for _T in config_test expect_test fork_test meta_data_test result_test srcdir_test

Modified: stable/10/libexec/Makefile
==============================================================================
--- stable/10/libexec/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/libexec/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -28,6 +28,7 @@ SUBDIR=	${_atf} \
 	talkd \
 	tcpd \
 	${_telnetd} \
+	${_tests} \
 	tftpd \
 	${_tftp-proxy} \
 	ulog-helper \
@@ -74,6 +75,7 @@ _telnetd=	telnetd
 
 .if ${MK_TESTS} != "no"
 _atf=		atf
+_tests=		tests
 .endif
 
 .include <bsd.subdir.mk>

Modified: stable/10/libexec/atf/Makefile
==============================================================================
--- stable/10/libexec/atf/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/libexec/atf/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-check
+SUBDIR=	atf-check tests
 
 .include <bsd.subdir.mk>

Modified: stable/10/libexec/atf/Makefile.inc
==============================================================================
--- stable/10/libexec/atf/Makefile.inc	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/libexec/atf/Makefile.inc	Sat Dec 28 23:08:58 2013	(r260024)
@@ -25,8 +25,6 @@
 #
 # $FreeBSD$
 
-ATF = ${.CURDIR}/../../../contrib/atf
-
 CFLAGS+=	-DHAVE_CONFIG_H
 
 WARNS?=		3

Modified: stable/10/libexec/atf/atf-check/Makefile
==============================================================================
--- stable/10/libexec/atf/atf-check/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/libexec/atf/atf-check/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -27,6 +27,7 @@
 
 .include <bsd.init.mk>
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 BINDIR=		/usr/libexec
@@ -42,4 +43,8 @@ LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/
 LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c
 LDADD+=		-latf-c++ -latf-c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Copied: stable/10/libexec/atf/atf-check/Makefile.inc (from r257853, head/libexec/atf/atf-check/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/libexec/atf/atf-check/Makefile.inc	Sat Dec 28 23:08:58 2013	(r260024, copy of r257853, head/libexec/atf/atf-check/Makefile.inc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: stable/10/usr.bin/Makefile
==============================================================================
--- stable/10/usr.bin/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/usr.bin/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -160,6 +160,7 @@ SUBDIR=	alias \
 	tar \
 	tcopy \
 	tee \
+	${_tests} \
 	tftp \
 	time \
 	tip \
@@ -330,6 +331,7 @@ SUBDIR+=	telnet
 
 .if ${MK_TESTS} != "no"
 _atf=		atf
+_tests=		tests
 .endif
 
 .if ${MK_TEXTPROC} != "no"

Modified: stable/10/usr.bin/atf/Makefile
==============================================================================
--- stable/10/usr.bin/atf/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/usr.bin/atf/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-sh
+SUBDIR=	atf-sh tests
 
 .include <bsd.subdir.mk>

Modified: stable/10/usr.bin/atf/Makefile.inc
==============================================================================
--- stable/10/usr.bin/atf/Makefile.inc	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/usr.bin/atf/Makefile.inc	Sat Dec 28 23:08:58 2013	(r260024)
@@ -1,6 +1,4 @@
 # $FreeBSD$
 
-ATF=		${.CURDIR}/../../../contrib/atf
-
 BINDIR?=	/usr/bin
 WARNS?=		3

Modified: stable/10/usr.bin/atf/atf-sh/Makefile
==============================================================================
--- stable/10/usr.bin/atf/atf-sh/Makefile	Sat Dec 28 23:02:48 2013	(r260023)
+++ stable/10/usr.bin/atf/atf-sh/Makefile	Sat Dec 28 23:08:58 2013	(r260024)
@@ -27,6 +27,7 @@
 
 .include <bsd.init.mk>
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 PROG_CXX=	atf-sh
@@ -44,4 +45,8 @@ FILESGROUPS=	SUBR
 SUBRDIR=	${SHAREDIR}/atf
 SUBR=		libatf-sh.subr
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>


More information about the svn-src-stable-10 mailing list