Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Sep 2014 04:00:31 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r271298 - in stable/10: . etc/mtree libexec/atf libexec/atf/atf-check libexec/atf/atf-sh share/mk tools/build/mk usr.bin
Message-ID:  <201409090400.s8940Vwv099647@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Tue Sep  9 04:00:30 2014
New Revision: 271298
URL: http://svnweb.freebsd.org/changeset/base/271298

Log:
  MFC r267176, r267181, r268445 (ATF-related commits):
  
  Phabric: https://reviews.freebsd.org/D706
  Approved by: rpaulo (mentor)
  Approved by: re (gjb)
  Reviewed by: jmmv
  Sponsored by: EMC / Isilon Storage Division
  
  r267176:
  
   Add the *_TESTS_SH_SED_* functionality to atf.test.mk.
  
   This exists already in plain.test.mk and tap.test.mk and should have been
   added to atf.test.mk too when the feature was first introduced.
  
   (It is probably time to address the related TODOs but I will do that
   separately.)
  
  r267181:
  
   Move atf-sh from /usr/bin/ to /usr/libexec/
  
   In r266650, we made libatf-c and libatf-c++ private libraries so that no
   components outside of the source tree could unintendedly depend on them.
  
   This change does the same for the "atf-sh library" by moving the atf-sh
   interpreter from its public location in /usr/bin/ to the private location
   in /usr/libexec/.  Our build system will ensure that our own test programs
   use the right binary, but users won't be able to depend on atf-sh by
   "mistake".
  
   Committing this now to ride the UPDATING notice added with r267172 today.
  
  r268445:
  
   Fix atf-sh's integration_test
  
   With the move of atf-sh into /usr/libexec in r267181, some of the
   tests in the integration_test program broke because they could not
   execute atf-sh from the path any longer.
  
   This slipped through because I do have a local atf installation in
   my home directory that appears in my path, hence the tests could
   still execute my own version.
  
   Fix this by forcing /usr/libexec to appear at the beginning of the
   path when attempting to execute atf-sh.
  
   To make upgrading easy (and to avoid an unnecessary entry in UPDATING),
   make integration_test depend on the Makefile so that a rebuild of the
   shell script is triggered.  This requires a hack in the *.test.mk files
   to ensure the Makefile is not treated as a source to the generated
   program.  Ugly, I know, but I don't have a better way of doing this at
   the moment.  Will think of one once I address the TODO in the *.test.mk
   files that suggests generalizing the file generation functionality.
  
   PR:		191052
   Reviewed by:	Garrett Cooper

Added:
  stable/10/libexec/atf/atf-sh/
     - copied from r267181, head/libexec/atf/atf-sh/
Modified:
  stable/10/UPDATING
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/libexec/atf/Makefile
  stable/10/libexec/atf/Makefile.inc
  stable/10/libexec/atf/atf-check/Makefile
  stable/10/libexec/atf/atf-sh/Makefile
  stable/10/share/mk/atf.test.mk
  stable/10/share/mk/plain.test.mk
  stable/10/share/mk/tap.test.mk
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.bin/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/UPDATING	Tue Sep  9 04:00:30 2014	(r271298)
@@ -33,11 +33,16 @@ older version of current is a bit fragil
 	programs once the operator executes "make delete-old-libs" after a
 	"make installworld".
 
+	Additionally, the atf-sh binary was made private by moving it into
+	/usr/libexec/.  Already-built shell test programs will keep the
+	path to the old binary so they will break after "make delete-old"
+	is run.
+
 	If you are using WITH_TESTS=yes (not the default), wipe the object
 	tree and rebuild from scratch to prevent spurious test failures.
-	This is only needed once: the old, misnumbered libraries have been
-	added to OptionalObsoleteFiles.inc so they will be removed during a
-	clean upgrade.
+	This is only needed once: the misnumbered libraries and misplaced
+	binaries have been added to OptionalObsoleteFiles.inc so they will
+	be removed during a clean upgrade.
 
 20140814:
 	The ixgbe tunables now match their sysctl counterparts, for example:

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/etc/mtree/BSD.tests.dist	Tue Sep  9 04:00:30 2014	(r271298)
@@ -92,6 +92,8 @@
             atf
                 atf-check
                 ..
+                atf-sh
+                ..
             ..
         ..
         sbin
@@ -133,10 +135,6 @@
         usr.bin
             apply
             ..
-            atf
-                atf-sh
-                ..
-            ..
             calendar
             ..
             comm

Modified: stable/10/libexec/atf/Makefile
==============================================================================
--- stable/10/libexec/atf/Makefile	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/libexec/atf/Makefile	Tue Sep  9 04:00:30 2014	(r271298)
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-check tests
+SUBDIR=	atf-check atf-sh tests
 
 .include <bsd.subdir.mk>

Modified: stable/10/libexec/atf/Makefile.inc
==============================================================================
--- stable/10/libexec/atf/Makefile.inc	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/libexec/atf/Makefile.inc	Tue Sep  9 04:00:30 2014	(r271298)
@@ -28,3 +28,5 @@
 CFLAGS+=	-DHAVE_CONFIG_H
 
 WARNS?=		3
+
+.include "../Makefile.inc"

Modified: stable/10/libexec/atf/atf-check/Makefile
==============================================================================
--- stable/10/libexec/atf/atf-check/Makefile	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/libexec/atf/atf-check/Makefile	Tue Sep  9 04:00:30 2014	(r271298)
@@ -30,7 +30,6 @@
 ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
-BINDIR=		/usr/libexec
 PROG_CXX=	atf-check
 SRCS=		atf-check.cpp
 MAN=		atf-check.1

Modified: stable/10/libexec/atf/atf-sh/Makefile
==============================================================================
--- head/libexec/atf/atf-sh/Makefile	Fri Jun  6 18:58:06 2014	(r267181)
+++ stable/10/libexec/atf/atf-sh/Makefile	Tue Sep  9 04:00:30 2014	(r271298)
@@ -25,7 +25,6 @@
 #
 # $FreeBSD$
 
-.include <src.opts.mk>
 .include <bsd.init.mk>
 
 ATF=		${.CURDIR:H:H:H}/contrib/atf

Modified: stable/10/share/mk/atf.test.mk
==============================================================================
--- stable/10/share/mk/atf.test.mk	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/share/mk/atf.test.mk	Tue Sep  9 04:00:30 2014	(r271298)
@@ -98,10 +98,15 @@ _TESTS+= ${ATF_TESTS_SH}
 SCRIPTSDIR_${_T}= ${TESTSDIR}
 TEST_INTERFACE.${_T}= atf
 CLEANFILES+= ${_T} ${_T}.tmp
+# TODO(jmmv): It seems to me that this SED and SRC functionality should
+# exist in bsd.prog.mk along the support for SCRIPTS.  Move it there if
+# this proves to be useful within the tests.
+ATF_TESTS_SH_SED_${_T}?= # empty
 ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
 ${_T}: ${ATF_TESTS_SH_SRC_${_T}}
-	echo '#! /usr/bin/atf-sh' > ${.TARGET}.tmp
-	cat ${.ALLSRC} >> ${.TARGET}.tmp
+	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
+	cat ${.ALLSRC:N*Makefile*} \
+	    | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor

Modified: stable/10/share/mk/plain.test.mk
==============================================================================
--- stable/10/share/mk/plain.test.mk	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/share/mk/plain.test.mk	Tue Sep  9 04:00:30 2014	(r271298)
@@ -57,7 +57,8 @@ CLEANFILES+= ${_T} ${_T}.tmp
 PLAIN_TESTS_SH_SED_${_T}?= # empty
 PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh
 ${_T}: ${PLAIN_TESTS_SH_SRC_${_T}}
-	cat ${.ALLSRC} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
+	cat ${.ALLSRC:N*Makefile*} \
+	    | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor

Modified: stable/10/share/mk/tap.test.mk
==============================================================================
--- stable/10/share/mk/tap.test.mk	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/share/mk/tap.test.mk	Tue Sep  9 04:00:30 2014	(r271298)
@@ -66,7 +66,7 @@ TAP_TESTS_PERL_SRC_${_T}?= ${_T}.pl
 ${_T}: ${TAP_TESTS_PERL_SRC_${_T}}
 	{ \
 	    echo '#! ${TAP_PERL_INTERPRETER}'; \
-	    cat ${.ALLSRC} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
+	    cat ${.ALLSRC:N*Makefile*} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
 	} >${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Tue Sep  9 04:00:30 2014	(r271298)
@@ -4070,6 +4070,7 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.
 .endif
 
 .if ${MK_TESTS} == yes
+OLD_FILES+=usr/bin/atf-sh
 OLD_LIBS+=usr/lib/libatf-c++.a
 OLD_LIBS+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
@@ -4130,6 +4131,17 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/pr
 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
+OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/config_test
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/integration_test
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/misc_helpers
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/normalize_test
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tc_test
+OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tp_test
+OLD_DIRS+=usr/tests/usr.bin/atf/atf-sh
+OLD_DIRS+=usr/tests/usr.bin/atf
 .if ${MK_MAKE} == yes && ${MK_BMAKE} == yes
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile

Modified: stable/10/usr.bin/Makefile
==============================================================================
--- stable/10/usr.bin/Makefile	Tue Sep  9 03:10:21 2014	(r271297)
+++ stable/10/usr.bin/Makefile	Tue Sep  9 04:00:30 2014	(r271298)
@@ -12,7 +12,6 @@
 SUBDIR=	alias \
 	apply \
 	asa \
-	${_atf} \
 	awk \
 	banner \
 	basename \
@@ -335,7 +334,6 @@ SUBDIR+=	telnet
 .endif
 
 .if ${MK_TESTS} != "no"
-_atf=		atf
 _tests=		tests
 .endif
 



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