Page MenuHomeFreeBSD
Files F131880782

D706.id1304.diff
No OneTemporary
Actions

D706.id1304.diff
View Options

Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -26,11 +26,16 @@
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:
Index: etc/mtree/BSD.tests.dist
===================================================================
--- etc/mtree/BSD.tests.dist
+++ etc/mtree/BSD.tests.dist
@@ -92,6 +92,8 @@
atf
atf-check
..
+ atf-sh
+ ..
..
..
sbin
@@ -133,10 +135,6 @@
usr.bin
apply
..
- atf
- atf-sh
- ..
- ..
calendar
..
comm
Index: libexec/atf/Makefile
===================================================================
--- libexec/atf/Makefile
+++ libexec/atf/Makefile
@@ -25,6 +25,6 @@
#
# $FreeBSD$
-SUBDIR= atf-check tests
+SUBDIR= atf-check atf-sh tests
.include <bsd.subdir.mk>
Index: libexec/atf/Makefile.inc
===================================================================
--- libexec/atf/Makefile.inc
+++ libexec/atf/Makefile.inc
@@ -28,3 +28,5 @@
CFLAGS+= -DHAVE_CONFIG_H
WARNS?= 3
+
+.include "../Makefile.inc"
Index: libexec/atf/atf-check/Makefile
===================================================================
--- libexec/atf/atf-check/Makefile
+++ libexec/atf/atf-check/Makefile
@@ -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
Index: libexec/atf/atf-sh/Makefile
===================================================================
--- libexec/atf/atf-sh/Makefile
+++ libexec/atf/atf-sh/Makefile
@@ -25,7 +25,6 @@
#
# $FreeBSD$
-.include <src.opts.mk>
.include <bsd.init.mk>
ATF= ${.CURDIR:H:H:H}/contrib/atf
Index: share/mk/atf.test.mk
===================================================================
--- share/mk/atf.test.mk
+++ share/mk/atf.test.mk
@@ -98,10 +98,15 @@
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
Index: share/mk/plain.test.mk
===================================================================
--- share/mk/plain.test.mk
+++ share/mk/plain.test.mk
@@ -57,7 +57,8 @@
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
Index: share/mk/tap.test.mk
===================================================================
--- share/mk/tap.test.mk
+++ share/mk/tap.test.mk
@@ -66,7 +66,7 @@
${_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}
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -4070,6 +4070,7 @@
.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/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
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -12,7 +12,6 @@
SUBDIR= alias \
apply \
asa \
- ${_atf} \
awk \
banner \
basename \
@@ -335,7 +334,6 @@
.endif
.if ${MK_TESTS} != "no"
-_atf= atf
_tests= tests
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 12, 10:33 PM (11 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23643923
Default Alt Text
D706.id1304.diff (5 KB)

Event Timeline