svn commit: r267181 - in head: . etc/mtree libexec/atf libexec/atf/atf-check libexec/atf/atf-sh libexec/atf/atf-sh/tests share/mk tools/build/mk usr.bin usr.bin/atf

Julio Merino jmmv at FreeBSD.org
Fri Jun 6 18:58:09 UTC 2014 

Author: jmmv
Date: Fri Jun  6 18:58:06 2014
New Revision: 267181
URL: http://svnweb.freebsd.org/changeset/base/267181

Log:
  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.

Added:
  head/libexec/atf/atf-sh/
     - copied from r267172, head/usr.bin/atf/atf-sh/
Deleted:
  head/usr.bin/atf/
Modified:
  head/UPDATING
  head/etc/mtree/BSD.tests.dist
  head/libexec/atf/Makefile
  head/libexec/atf/Makefile.inc
  head/libexec/atf/atf-check/Makefile
  head/libexec/atf/atf-sh/tests/Makefile
  head/share/mk/atf.test.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/UPDATING	Fri Jun  6 18:58:06 2014	(r267181)
@@ -41,11 +41,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	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.
 
 20140512:
 	Clang and llvm have been upgraded to 3.4.1 release.

Modified: head/etc/mtree/BSD.tests.dist
==============================================================================
--- head/etc/mtree/BSD.tests.dist	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/etc/mtree/BSD.tests.dist	Fri Jun  6 18:58:06 2014	(r267181)
@@ -88,6 +88,8 @@
             atf
                 atf-check
                 ..
+                atf-sh
+                ..
             ..
         ..
         sbin
@@ -127,10 +129,6 @@
         usr.bin
             apply
             ..
-            atf
-                atf-sh
-                ..
-            ..
             bmake
                 archives
                     fmt_44bsd

Modified: head/libexec/atf/Makefile
==============================================================================
--- head/libexec/atf/Makefile	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/libexec/atf/Makefile	Fri Jun  6 18:58:06 2014	(r267181)
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-check tests
+SUBDIR=	atf-check atf-sh tests
 
 .include <bsd.subdir.mk>

Modified: head/libexec/atf/Makefile.inc
==============================================================================
--- head/libexec/atf/Makefile.inc	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/libexec/atf/Makefile.inc	Fri Jun  6 18:58:06 2014	(r267181)
@@ -28,3 +28,5 @@
 CFLAGS+=	-DHAVE_CONFIG_H
 
 WARNS?=		3
+
+.include "../Makefile.inc"

Modified: head/libexec/atf/atf-check/Makefile
==============================================================================
--- head/libexec/atf/atf-check/Makefile	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/libexec/atf/atf-check/Makefile	Fri Jun  6 18:58:06 2014	(r267181)
@@ -31,7 +31,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: head/libexec/atf/atf-sh/tests/Makefile
==============================================================================
--- head/usr.bin/atf/atf-sh/tests/Makefile	Fri Jun  6 17:05:43 2014	(r267172)
+++ head/libexec/atf/atf-sh/tests/Makefile	Fri Jun  6 18:58:06 2014	(r267181)
@@ -2,7 +2,7 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=	${TESTSBASE}/usr.bin/atf/atf-sh
+TESTSDIR=	${TESTSBASE}/libexec/atf/atf-sh
 
 ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
@@ -10,6 +10,8 @@ ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 ATF_TESTS_SH+=	atf_check_test
 ATF_TESTS_SH+=	config_test
 ATF_TESTS_SH+=	integration_test
+ATF_TESTS_SH_SED_integration_test= \
+    -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
 ATF_TESTS_SH+=	normalize_test
 ATF_TESTS_SH+=	tc_test
 ATF_TESTS_SH+=	tp_test
@@ -18,7 +20,7 @@ SCRIPTS+=		misc_helpers
 SCRIPTSDIR_misc_helpers=${TESTSDIR}
 CLEANFILES+=		misc_helpers misc_helpers.tmp
 misc_helpers: misc_helpers.sh
-	echo '#! /usr/bin/atf-sh' >${.TARGET}.tmp
+	echo '#! /usr/libexec/atf-sh' >${.TARGET}.tmp
 	cat ${.ALLSRC} >>${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}

Modified: head/share/mk/atf.test.mk
==============================================================================
--- head/share/mk/atf.test.mk	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/share/mk/atf.test.mk	Fri Jun  6 18:58:06 2014	(r267181)
@@ -104,7 +104,7 @@ CLEANFILES+= ${_T} ${_T}.tmp
 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
+	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
 	cat ${.ALLSRC} | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri Jun  6 18:58:06 2014	(r267181)
@@ -4103,6 +4103,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
@@ -4135,6 +4136,17 @@ OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
+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
 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

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Fri Jun  6 18:36:02 2014	(r267180)
+++ head/usr.bin/Makefile	Fri Jun  6 18:58:06 2014	(r267181)
@@ -12,7 +12,6 @@
 SUBDIR=	alias \
 	apply \
 	asa \
-	${_atf} \
 	awk \
 	banner \
 	basename \
@@ -333,7 +332,6 @@ SUBDIR+=	telnet
 .endif
 
 .if ${MK_TESTS} != "no"
-_atf=		atf
 _tests=		tests
 .endif

More information about the svn-src-all mailing list