Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Jan 2014 23:38:33 +0000 (UTC)
From:      Julio Merino <jmmv@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r260525 - in head: etc/mtree lib/atf/libatf-c++/tests lib/atf/libatf-c++/tests/detail lib/atf/libatf-c/tests lib/atf/libatf-c/tests/detail tools/build/mk
Message-ID:  <201401102338.s0ANcX15047582@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jmmv
Date: Fri Jan 10 23:38:33 2014
New Revision: 260525
URL: http://svnweb.freebsd.org/changeset/base/260525

Log:
  Respect the original layout of the atf-{c,c++} tests.
  
  Put test programs for internal modules into a 'detail' subdirectory of the
  libatf-c and libatf-c++ test directories, just as the upstream distribution
  does.  This is necessary because the tests assume such layout to find the
  process_helper program, and currently fail because of this divergence.
  
  MFC after:	1 week

Added:
  head/lib/atf/libatf-c++/tests/Makefile.inc   (contents, props changed)
  head/lib/atf/libatf-c++/tests/detail/
  head/lib/atf/libatf-c++/tests/detail/Makefile   (contents, props changed)
  head/lib/atf/libatf-c/tests/Makefile.inc   (contents, props changed)
  head/lib/atf/libatf-c/tests/detail/
  head/lib/atf/libatf-c/tests/detail/Makefile   (contents, props changed)
Modified:
  head/etc/mtree/BSD.tests.dist
  head/lib/atf/libatf-c++/tests/Makefile
  head/lib/atf/libatf-c/tests/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Fri Jan 10 23:08:18 2014	(r260524)
+++ head/etc/mtree/BSD.tests.dist	Fri Jan 10 23:38:33 2014	(r260525)
@@ -49,8 +49,12 @@
         lib
             atf
                 libatf-c
+                    detail
+                    ..
                 ..
                 libatf-c++
+                    detail
+                    ..
                 ..
                 test-programs
                 ..

Modified: head/lib/atf/libatf-c++/tests/Makefile
==============================================================================
--- head/lib/atf/libatf-c++/tests/Makefile	Fri Jan 10 23:08:18 2014	(r260524)
+++ head/lib/atf/libatf-c++/tests/Makefile	Fri Jan 10 23:38:33 2014	(r260525)
@@ -3,6 +3,7 @@
 .include <bsd.init.mk>
 
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++
+TESTS_SUBDIRS=	detail
 
 ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-c++
@@ -14,7 +15,6 @@ FILESDIR=	${TESTSDIR}
 FILES=		macros_hpp_test.cpp
 FILES+=		unused_test.cpp
 
-# Tests in atf-c++.
 .for _T in	atf_c++_test \
 		build_test \
 		check_test \
@@ -28,20 +28,4 @@ SRCS.${_T}=	${_T}.cpp test_helpers.cpp
 
 ATF_TESTS_SH=	pkg_config_test
 
-# Tests in atf-c++/detail.
-
-.for _T in	application_test \
-		env_test \
-		exceptions_test \
-		expand_test \
-		fs_test \
-		parser_test \
-		process_test \
-		sanity_test \
-		text_test \
-		ui_test
-ATF_TESTS_CXX+=	${_T}
-SRCS.${_T}=	${_T}.cpp test_helpers.cpp
-.endfor
-
 .include <atf.test.mk>

Added: head/lib/atf/libatf-c++/tests/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/atf/libatf-c++/tests/Makefile.inc	Fri Jan 10 23:38:33 2014	(r260525)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Added: head/lib/atf/libatf-c++/tests/detail/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/atf/libatf-c++/tests/detail/Makefile	Fri Jan 10 23:38:33 2014	(r260525)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++/detail
+
+ATF=		${.CURDIR:H:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-c++/detail
+
+CFLAGS+=	-I${ATF}
+
+.for _T in	application_test \
+		env_test \
+		exceptions_test \
+		expand_test \
+		fs_test \
+		parser_test \
+		process_test \
+		sanity_test \
+		text_test \
+		ui_test
+ATF_TESTS_CXX+=	${_T}
+SRCS.${_T}=	${_T}.cpp test_helpers.cpp
+.endfor
+
+.include <atf.test.mk>

Modified: head/lib/atf/libatf-c/tests/Makefile
==============================================================================
--- head/lib/atf/libatf-c/tests/Makefile	Fri Jan 10 23:08:18 2014	(r260524)
+++ head/lib/atf/libatf-c/tests/Makefile	Fri Jan 10 23:38:33 2014	(r260525)
@@ -3,6 +3,7 @@
 .include <bsd.init.mk>
 
 TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c
+TESTS_SUBDIRS=	detail
 
 ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-c
@@ -19,8 +20,6 @@ FILESDIR=	${TESTSDIR}
 FILES=		macros_h_test.c
 FILES+=		unused_test.c
 
-# Tests in atf-c.
-
 .for _T in	atf_c_test \
 		build_test \
 		check_test \
@@ -36,24 +35,4 @@ SRCS.${_T}=	${_T}.c test_helpers.c
 
 ATF_TESTS_SH=	pkg_config_test
 
-# Tests in atf-c/detail.
-
-.for _T in	dynstr_test \
-		env_test \
-		fs_test \
-		list_test \
-		map_test \
-		process_test \
-		sanity_test \
-		text_test \
-		user_test
-ATF_TESTS_C+=	${_T}
-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}
-
 .include <atf.test.mk>

Added: head/lib/atf/libatf-c/tests/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/atf/libatf-c/tests/Makefile.inc	Fri Jan 10 23:38:33 2014	(r260525)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Added: head/lib/atf/libatf-c/tests/detail/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/atf/libatf-c/tests/detail/Makefile	Fri Jan 10 23:38:33 2014	(r260525)
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c/detail
+
+ATF=		${.CURDIR:H:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-c/detail
+
+CFLAGS+=	-I${ATF}
+
+.for _T in	dynstr_test \
+		env_test \
+		fs_test \
+		list_test \
+		map_test \
+		process_test \
+		sanity_test \
+		text_test \
+		user_test
+ATF_TESTS_C+=	${_T}
+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}
+
+.include <atf.test.mk>

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jan 10 23:08:18 2014	(r260524)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jan 10 23:38:33 2014	(r260525)
@@ -4066,6 +4066,26 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.
 .if ${MK_TESTS} == yes
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/env_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/exceptions_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/expand_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/fs_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/env_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
+OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
+OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
 .else
 # ATF libraries.
 OLD_FILES+=usr/bin/atf-sh



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401102338.s0ANcX15047582>