Re: svn commit: r307190 - head/contrib/netbsd-tests/fs/tmpfs
On Thu, Oct 13, 2016 at 3:29 AM, Ngie Cooper (yaneurabeya) <
yaneurab...@gmail.com> wrote:
>
> > On Oct 13, 2016, at 00:20, Julio Merino <ju...@meroh.net> wrote:
> >
> > On Thu, Oct 13, 2016 at 3:02 AM, Ngie Cooper <n...@freebsd.org> wrote:
> > Author: ngie
> > Date: Thu Oct 13 07:02:54 2016
> > New Revision: 307190
> > URL: https://svnweb.freebsd.org/changeset/base/307190
> >
> > Log:
> > Skip :uchg on FreeBSD
> >
> > Unfortunately removing files with uchg set always succeeds with root on
> > FreeBSD. Unfortunately running the test as an unprivileged user isn't
> doable
> > because mounting tmpfs requires root
> >
> > PR: 212861
> > Sponsored by: Dell EMC Isilon
> >
> > Modified:
> > head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
> >
> > Modified: head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
> >
> ==
> > --- head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh Thu Oct 13
> 06:56:23 2016(r307189)
> > +++ head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh Thu Oct 13
> 07:02:54 2016(r307190)
> > @@ -53,6 +53,10 @@ uchg_head() {
> > atf_set "require.user" "root"
> > }
> > uchg_body() {
> > + # Begin FreeBSD
> > + atf_skip "this fails on FreeBSD with root - bug 212861"
> > + # End FreeBSD
> >
> > This is a bad way of disabling a test due to a known bug because, when
> the bug is resolved, the test won't notice. You should be using the
> "expected failures" functionality if possible, and based on the change
> description, I think you can do this here easily. Try:
> >
> > atf_expect_fail "FreeBSD bug 213861 blah blah"
> >
> > right before the line that triggers the test failure.
>
> The problem is that this leaves tmpfs mounts lying around, which atf won’t
> cleanup. Otherwise, I would totally agree with you.
>
Replace:
atf_test_case uchg
with:
atf_test_case uchg cleanup
and then add:
uchg_cleanup() {
umount foo/bar 2>/dev/null || true
}
This is actually *necessary* regardless of how you skip the test to ensure
the mount point is cleaned up on any failure of the test. If the tests are
not doing that yet, they are bogus.
--
Julio Merino -- http://julio.meroh.net/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r307190 - head/contrib/netbsd-tests/fs/tmpfs
On Thu, Oct 13, 2016 at 3:02 AM, Ngie Cooper <n...@freebsd.org> wrote:
> Author: ngie
> Date: Thu Oct 13 07:02:54 2016
> New Revision: 307190
> URL: https://svnweb.freebsd.org/changeset/base/307190
>
> Log:
> Skip :uchg on FreeBSD
>
> Unfortunately removing files with uchg set always succeeds with root on
> FreeBSD. Unfortunately running the test as an unprivileged user isn't
> doable
> because mounting tmpfs requires root
>
> PR: 212861
> Sponsored by: Dell EMC Isilon
>
> Modified:
> head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
>
> Modified: head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
>
> ==
> --- head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh Thu Oct 13
> 06:56:23 2016(r307189)
> +++ head/contrib/netbsd-tests/fs/tmpfs/t_remove.sh Thu Oct 13
> 07:02:54 2016(r307190)
> @@ -53,6 +53,10 @@ uchg_head() {
> atf_set "require.user" "root"
> }
> uchg_body() {
> + # Begin FreeBSD
> + atf_skip "this fails on FreeBSD with root - bug 212861"
> + # End FreeBSD
>
This is a bad way of disabling a test due to a known bug because, when the
bug is resolved, the test won't notice. You should be using the "expected
failures" functionality if possible, and based on the change description, I
think you can do this here easily. Try:
atf_expect_fail "FreeBSD bug 213861 blah blah"
right before the line that triggers the test failure.
--
Julio Merino -- http://julio.meroh.net/
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304797 - head/tests/sys/kqueue
Author: jmmv
Date: Thu Aug 25 10:28:47 2016
New Revision: 304797
URL: https://svnweb.freebsd.org/changeset/base/304797
Log:
Make use of Kyua's work directories.
Change the vnode tests to use the current directory when creating temporary
files, which we can assume is a volatile work directory, and then make the
kqueue_test.sh driver _not_ abandon the directory created by Kyua.
This makes the various kqueue tests independent of each other, and ensures
the temporary file is cleaned up on failure.
Problem spotted by asomers@ when reviewing D4254.
Modified:
head/tests/sys/kqueue/kqueue_test.sh
head/tests/sys/kqueue/vnode.c
Modified: head/tests/sys/kqueue/kqueue_test.sh
==
--- head/tests/sys/kqueue/kqueue_test.shThu Aug 25 10:27:22 2016
(r304796)
+++ head/tests/sys/kqueue/kqueue_test.shThu Aug 25 10:28:47 2016
(r304797)
@@ -1,8 +1,8 @@
#!/bin/sh
+# $FreeBSD$
-cd $(dirname $0)
i=1
-./kqtest | while read line; do
+"$(dirname $0)/kqtest" | while read line; do
echo $line | grep -q passed
if [ $? -eq 0 ]; then
echo "ok - $i $line"
Modified: head/tests/sys/kqueue/vnode.c
==
--- head/tests/sys/kqueue/vnode.c Thu Aug 25 10:27:22 2016
(r304796)
+++ head/tests/sys/kqueue/vnode.c Thu Aug 25 10:28:47 2016
(r304797)
@@ -25,12 +25,12 @@ void
test_kevent_vnode_add(void)
{
const char *test_id = "kevent(EVFILT_VNODE, EV_ADD)";
-const char *testfile = "/tmp/kqueue-test.tmp";
+const char *testfile = "./kqueue-test.tmp";
struct kevent kev;
test_begin(test_id);
-system("touch /tmp/kqueue-test.tmp");
+system("touch ./kqueue-test.tmp");
vnode_fd = open(testfile, O_RDONLY);
if (vnode_fd < 0)
err(1, "open of %s", testfile);
@@ -57,7 +57,7 @@ test_kevent_vnode_note_delete(void)
if (kevent(kqfd, , 1, NULL, 0, NULL) < 0)
err(1, "%s", test_id);
-if (unlink("/tmp/kqueue-test.tmp") < 0)
+if (unlink("./kqueue-test.tmp") < 0)
err(1, "unlink");
kevent_cmp(, kevent_get(kqfd));
@@ -77,7 +77,7 @@ test_kevent_vnode_note_write(void)
if (kevent(kqfd, , 1, NULL, 0, NULL) < 0)
err(1, "%s", test_id);
-if (system("echo hello >> /tmp/kqueue-test.tmp") < 0)
+if (system("echo hello >> ./kqueue-test.tmp") < 0)
err(1, "system");
/* BSD kqueue adds NOTE_EXTEND even though it was not requested */
@@ -102,7 +102,7 @@ test_kevent_vnode_note_attrib(void)
if (kevent(kqfd, , 1, NULL, 0, NULL) < 0)
err(1, "%s", test_id);
-if (system("touch /tmp/kqueue-test.tmp") < 0)
+if (system("touch ./kqueue-test.tmp") < 0)
err(1, "system");
nfds = kevent(kqfd, NULL, 0, , 1, NULL);
@@ -130,7 +130,7 @@ test_kevent_vnode_note_rename(void)
if (kevent(kqfd, , 1, NULL, 0, NULL) < 0)
err(1, "%s", test_id);
-if (system("mv /tmp/kqueue-test.tmp /tmp/kqueue-test2.tmp") < 0)
+if (system("mv ./kqueue-test.tmp ./kqueue-test2.tmp") < 0)
err(1, "system");
nfds = kevent(kqfd, NULL, 0, , 1, NULL);
@@ -142,7 +142,7 @@ test_kevent_vnode_note_rename(void)
err(1, "%s - incorrect event (sig=%u; filt=%d; flags=%d)",
test_id, (unsigned int)kev.ident, kev.filter, kev.flags);
-if (system("mv /tmp/kqueue-test2.tmp /tmp/kqueue-test.tmp") < 0)
+if (system("mv ./kqueue-test2.tmp ./kqueue-test.tmp") < 0)
err(1, "system");
success();
@@ -183,7 +183,7 @@ test_kevent_vnode_disable_and_enable(voi
err(1, "%s", test_id);
/* Confirm that the watch is disabled */
-if (system("touch /tmp/kqueue-test.tmp") < 0)
+if (system("touch ./kqueue-test.tmp") < 0)
err(1, "system");
test_no_kevents();
@@ -191,7 +191,7 @@ test_kevent_vnode_disable_and_enable(voi
kev.flags = EV_ENABLE;
if (kevent(kqfd, , 1, NULL, 0, NULL) < 0)
err(1, "%s", test_id);
-if (system("touch /tmp/kqueue-test.tmp") < 0)
+if (system("touch ./kqueue-test.tmp") < 0)
err(1, "system");
nfds = kevent(kqfd, NULL, 0, , 1, NULL);
if (nfds < 1)
@@ -221,7 +221,7 @@ test_kevent_vnode_dispatch(void)
if (kevent(kqfd, , 1, NULL, 0, NULL) < 0)
err(1, "%s", test_id);
-if (system("touch /tmp/kqueue-test.tmp") < 0)
+if (system("touch ./kqueue-test.tmp") < 0)
err(1, "system");
nfds = kevent(kqfd, NULL, 0, , 1, NULL);
@@ -235,7 +235,7 @@ test_kevent_vnode_dispatch(void)
/* Confirm that the watch is disabled automatically */
puts("-- checking that watch is disabled");
-if (system("touch /tmp/kqueue-test.tmp") < 0)
+if (system("touch ./kqueue-test.tmp") < 0)
err(1, "system");
test_no_kevents();
___
svn-src-all@freebsd.org mailing list
svn commit: r304741 - head/bin/ls/tests
Author: jmmv
Date: Wed Aug 24 10:10:26 2016
New Revision: 304741
URL: https://svnweb.freebsd.org/changeset/base/304741
Log:
Skip ls tests that use sparse files if these are not supported.
Some of the ls(1) tests create really large sparse files to validate
the number formatting features of ls(1). Unfortunately, those tests fail
if the underlying test file system does not support sparse files, as is the
case when /tmp is mounted on tmpfs.
Before running these tests, check if the test file system supports sparse
files by using getconf(1) and skip them if not. Note that the support for
this query was just added to getconf(1) in r304694.
Reviewed by: ngie
Differential Revision:https://reviews.freebsd.org/D7609
Modified:
head/bin/ls/tests/ls_tests.sh
Modified: head/bin/ls/tests/ls_tests.sh
==
--- head/bin/ls/tests/ls_tests.sh Wed Aug 24 09:57:19 2016
(r304740)
+++ head/bin/ls/tests/ls_tests.sh Wed Aug 24 10:10:26 2016
(r304741)
@@ -84,6 +84,14 @@ create_test_inputs2()
{
create_test_dir
+ if ! getconf MIN_HOLE_SIZE "$(pwd)"; then
+ echo "getconf MIN_HOLE_SIZE $(pwd) failed; sparse files probably" \
+"not supported by file system"
+ mount
+ atf_skip "Test's work directory does not support sparse files;" \
+"try with a different TMPDIR?"
+ fi
+
for filesize in 1 512 $(( 2 * $KB )) $(( 10 * $KB )) $(( 512 * $KB )); \
do
atf_check -e ignore -o empty -s exit:0 \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r299496 - head/contrib/atf/atf-c/detail
On Wed, May 11, 2016 at 7:39 PM, Conrad E. Meyer <c...@freebsd.org> wrote: > Author: cem > Date: Wed May 11 23:39:39 2016 > New Revision: 299496 > URL: https://svnweb.freebsd.org/changeset/base/299496 > > Log: > atf map: Fix double-free in low memory error path > > If atf_list_append(, X, ) fails, X is freed. Don't free it again. This fix seems bogus. I think the following is correct: https://github.com/jmmv/atf/commit/710d1cf96f3ab716e76b569714fd7303292d93b2 -- Julio Merino -- http://julio.meroh.net/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r289662 - in head: . etc etc/mtree tools/build/mk
Author: jmmv
Date: Tue Oct 20 20:35:34 2015
New Revision: 289662
URL: https://svnweb.freebsd.org/changeset/base/289662
Log:
Handle lib32 files during delete-old* when MK_LIB32=no.
Extend OptionalObsoleteFiles.inc to delete all lib32 files when MK_LIB32 is
set to no on a system that previously had lib32 libraries installed.
Also, to prevent "make delete-old-dirs" from always deleting lib32 directories
after an installworld, move the lib32 subtree to its own mtree file that only
gets applied when MK_LIB32=yes.
Test: Ran "make delete-old" and "make delete-old-libs" on a system that never
had MK_LIB32 enabled, and on a system where MK_LIB32 was enabled and later
disabled. Did this both on amd64 and powerpc64.
Test: Ran "make tinderbox" without errors.
Reviewed by: emaste
Differential Revision:https://reviews.freebsd.org/D3923
Added:
head/etc/mtree/BSD.lib32.dist (contents, props changed)
Modified:
head/Makefile.inc1
head/etc/Makefile
head/etc/mtree/BSD.debug.dist
head/etc/mtree/BSD.usr.dist
head/etc/mtree/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Oct 20 20:29:21 2015(r289661)
+++ head/Makefile.inc1 Tue Oct 20 20:35:34 2015(r289662)
@@ -560,6 +560,16 @@ _worldtmp:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-p ${WORLDTMP}/usr/lib >/dev/null
.endif
+.if ${MK_LIB32} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${WORLDTMP}/usr >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${WORLDTMP}/usr/lib/debug/usr >/dev/null
+.endif
+.endif
.if ${MK_TESTS} != "no"
mkdir -p ${WORLDTMP}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
@@ -653,9 +663,13 @@ build32:
-p ${LIB32TMP}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${LIB32TMP}/usr/include >/dev/null
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${LIB32TMP}/usr >/dev/null
.if ${MK_DEBUG_FILES} != "no"
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-p ${LIB32TMP}/usr/lib >/dev/null
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${LIB32TMP}/usr/lib/debug/usr >/dev/null
.endif
mkdir -p ${WORLDTMP}
ln -sf ${.CURDIR}/sys ${WORLDTMP}
@@ -901,6 +915,14 @@ distributeworld installworld: _installch
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
.endif
+.if ${MK_LIB32} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
+.if ${MK_DEBUG_FILES} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null
+.endif
+.endif
.if ${MK_TESTS} != "no" && ${dist} == "tests"
-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
@@ -917,6 +939,10 @@ distributeworld installworld: _installch
sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
+.if ${MK_LIB32} != "no"
+ ${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.lib32.dist | \
+ sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
+.endif
.endif
.endfor
-mkdir ${DESTDIR}/${DISTDIR}/base
@@ -2241,6 +2267,10 @@ _xi-mtree:
-p ${XDDESTDIR}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${XDDESTDIR}/usr/include >/dev/null
+.if ${MK_LIB32} != "no"
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \
+ -p ${XDDESTDIR}/usr >/dev/null
+.endif
.if ${MK_TESTS} != "no"
mkdir -p ${XDDESTDIR}${TESTSBASE}
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Oct 20 20:29:21 2015(r289661)
+++ head/etc/Makefile Tue Oct 20 20:35:34 2015(r289662)
@@ -151,6 +151,9 @@ BIN1+= regdomain.xml
BIN2= netstart pccard_ether rc.suspend rc.resume
MTREE= BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
+.if ${MK_LIB32} != "no"
+MTREE+=BSD.lib32.dist
+.endif
.if ${MK_TESTS} != "no"
MTREE+=BSD.tests.dist
.endif
@@ -344,6 +347,10 @@ MTREES=mtree/BSD.root.dist /
\
.if ${MK_GROFF} != "no"
MTREES+=
svn commit: r286652 - head/tools/build/mk
Author: jmmv Date: Wed Aug 12 03:03:51 2015 New Revision: 286652 URL: https://svnweb.freebsd.org/changeset/base/286652 Log: Mark usr/include/c++/v1/tr1 as obsolete The directory usr/include/c++/v1 was marked as obsolete but its tr1 subdir was not, resulting in a removal error in delete-old. Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Aug 12 00:49:20 2015(r286651) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Aug 12 03:03:51 2015(r286652) @@ -4017,6 +4017,7 @@ OLD_FILES+=usr/lib32/libcxxrt.a OLD_FILES+=usr/lib32/libcxxrt.so OLD_LIBS+=usr/lib32/libcxxrt.so.1 OLD_FILES+=usr/lib32/libcxxrt_p.a +OLD_DIRS+=usr/include/c++/v1/tr1 OLD_DIRS+=usr/include/c++/v1/experimental OLD_DIRS+=usr/include/c++/v1/ext OLD_DIRS+=usr/include/c++/v1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r285117 - head/tests/sys/netinet
Author: jmmv
Date: Sat Jul 4 02:22:26 2015
New Revision: 285117
URL: https://svnweb.freebsd.org/changeset/base/285117
Log:
Make cleanup routines idempotent
cleanup routines can be executed at any point during the execution of the
body, including even before the body has done any real work. In those
cases, cleanup routines should be careful to not raise spurious errors so
as to not override the actual result of the test case.
This is just general good coding style but is not a problem in practice
for these specific tests. (The way I discovered the issue, though, was
due to a regression I introduced in Kyua itself while refactoring some
internals.)
MFC after:1 week
Modified:
head/tests/sys/netinet/fibs_test.sh
Modified: head/tests/sys/netinet/fibs_test.sh
==
--- head/tests/sys/netinet/fibs_test.sh Sat Jul 4 01:02:43 2015
(r285116)
+++ head/tests/sys/netinet/fibs_test.sh Sat Jul 4 02:22:26 2015
(r285117)
@@ -98,9 +98,12 @@ arpresolve_checks_interface_fib_body()
}
arpresolve_checks_interface_fib_cleanup()
{
- for PID in `cat processes_to_kill`; do
- kill $PID
- done
+ if [ -f processes_to_kill ]; then
+ for pid in $(cat processes_to_kill); do
+ kill ${pid}
+ done
+ rm -f processes_to_kill
+ fi
cleanup_tap
}
@@ -476,8 +479,10 @@ setup_tap()
cleanup_tap()
{
- for TAPD in `cat tap_devices_to_cleanup`; do
- ifconfig ${TAPD} destroy
- done
- rm tap_devices_to_cleanup
+ if [ -f tap_devices_to_cleanup ]; then
+ for tap_device in $(cat tap_devices_to_cleanup); do
+ ifconfig ${tap_device} destroy
+ done
+ rm -f tap_devices_to_cleanup
+ fi
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r285118 - head/share/examples/tests/tests/plain
Author: jmmv Date: Sat Jul 4 02:24:47 2015 New Revision: 285118 URL: https://svnweb.freebsd.org/changeset/base/285118 Log: Add missing shebang Plain test programs are not preprocessed by the build system (as opposed to ATF test cases, which automatically gain a shebang pointing at atf-sh), so we must take care of providing the shebang ourselves. I'm not sure why this was not causing problems with Kyua 0.11, but the upcoming 0.12 release chokes on this particular issue. MFC after:1 week Modified: head/share/examples/tests/tests/plain/cp_test.sh Modified: head/share/examples/tests/tests/plain/cp_test.sh == --- head/share/examples/tests/tests/plain/cp_test.shSat Jul 4 02:22:26 2015(r285117) +++ head/share/examples/tests/tests/plain/cp_test.shSat Jul 4 02:24:47 2015(r285118) @@ -1,3 +1,4 @@ +#! /bin/sh # $FreeBSD$ # # Copyright 2013 Google Inc. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r285119 - head/share/mk
Author: jmmv
Date: Sat Jul 4 02:37:36 2015
New Revision: 285119
URL: https://svnweb.freebsd.org/changeset/base/285119
Log:
Add support for TEST_METADATA
Allow Makefiles to define generic metadata settings that apply to all test
programs defined by a Makefile. The generic TEST_METADATA variable extends
the per-test program settings already supported via TEST_METADATA.program.
This feature will be useful to easily apply some settings to all programs
in a directory. In particular, Kyua 0.12 will support parallel execution
of test programs and a bunch of them will need to be tagged as is_exclusive
to indicate that they cannot be run in parallel with anything else due to
their side-effects. It will be reasonable to set this setting on whole
directories.
MFC after:1 week
Modified:
head/share/mk/suite.test.mk
Modified: head/share/mk/suite.test.mk
==
--- head/share/mk/suite.test.mk Sat Jul 4 02:24:47 2015(r285118)
+++ head/share/mk/suite.test.mk Sat Jul 4 02:37:36 2015(r285119)
@@ -34,12 +34,19 @@ KYUAFILE?= auto
# Kyua as this is later encoded in the Kyuafile test program definitions.
#TEST_INTERFACE.test-program= interface-name
+# Metadata properties applicable to all test programs.
+#
+# All the variables for a test program defined in the Makefile are appended
+# to the test program's definition in the Kyuafile. This feature can be
+# used to avoid having to explicitly supply a Kyuafile in the source
+# directory, allowing the caller Makefile to rely on the KYUAFILE=auto
+# behavior defined here.
+#TEST_METADATA+= key=value
+
# Per-test program metadata properties as a list of key/value pairs.
#
-# All the variables for a particular program are appended to the program's
-# definition in the Kyuafile. This feature can be used to avoid having to
-# explicitly supply a Kyuafile in the source directory, allowing the caller
-# Makefile to rely on the KYUAFILE=auto behavior defined here.
+# These per-test program settings _extend_ the values provided in the
+# unqualified TEST_METADATA variable.
#TEST_METADATA.test-program+= key=value
# Path to the prefix of the installed Kyua CLI, if any.
@@ -61,6 +68,10 @@ FILESNAME_Kyuafile.auto= Kyuafile
CLEANFILES+= Kyuafile.auto Kyuafile.auto.tmp
+.for _T in ${_TESTS}
+_TEST_METADATA.${_T}= ${TEST_METADATA} ${TEST_METADATA.${_T}}
+.endfor
+
.NOPATH: Kyuafile.auto
Kyuafile.auto: Makefile
@{ \
@@ -72,7 +83,7 @@ Kyuafile.auto: Makefile
echo; \
} Kyuafile.auto.tmp
.for _T in ${_TESTS}
- @echo
'${TEST_INTERFACE.${_T}}_test_program{name=${_T}${TEST_METADATA.${_T}:C/$/,/:tW:C/^/,
/W:C/,$//W}}' \
+ @echo
'${TEST_INTERFACE.${_T}}_test_program{name=${_T}${_TEST_METADATA.${_T}:C/$/,/:tW:C/^/,
/W:C/,$//W}}' \
Kyuafile.auto.tmp
.endfor
.for _T in ${TESTS_SUBDIRS:N.WAIT}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r284912 - head/usr.bin/units
On Jun 28, 2015, at 15:05 , Garrett Cooper yaneurab...@gmail.com wrote: On Jun 28, 2015, at 09:43, Julio Merino j...@freebsd.org wrote: Author: jmmv Date: Sun Jun 28 16:43:07 2015 New Revision: 284912 URL: https://svnweb.freebsd.org/changeset/base/284912 Log: Only initialize libedit when necessary The code path to support units conversions from the command line need not initialize neither libedit nor the history. Therefore, only do that when in interactive mode. This hides the issue reported in PR bin/201167 whereby running commands of the form 'echo $(units ft in)' would corrupt the terminal. The real issue causing the corruption most likely still remains somewhere. PR:bin/201167 Differential Revision:D2935 Reviewed by:eadler Jenkins has been so messed up recently with timeouts and the like that it's hard to tell where things went south.. Can you please add your TERM and locale variables to the PR? I suspect that it might be a related issue.. Details added, but I don’t think they make a difference. Could reproduce the above under multiple combinations. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r284912 - head/usr.bin/units
Author: jmmv
Date: Sun Jun 28 16:43:07 2015
New Revision: 284912
URL: https://svnweb.freebsd.org/changeset/base/284912
Log:
Only initialize libedit when necessary
The code path to support units conversions from the command line
need not initialize neither libedit nor the history. Therefore, only do
that when in interactive mode.
This hides the issue reported in PR bin/201167 whereby running commands
of the form 'echo $(units ft in)' would corrupt the terminal. The real
issue causing the corruption most likely still remains somewhere.
PR: bin/201167
Differential Revision:D2935
Reviewed by: eadler
Modified:
head/usr.bin/units/units.c
Modified: head/usr.bin/units/units.c
==
--- head/usr.bin/units/units.c Sun Jun 28 12:52:28 2015(r284911)
+++ head/usr.bin/units/units.c Sun Jun 28 16:43:07 2015(r284912)
@@ -802,17 +802,6 @@ main(int argc, char **argv)
if (!readfile)
readunits(NULL);
- inhistory = history_init();
- el = el_init(argv[0], stdin, stdout, stderr);
- el_set(el, EL_PROMPT, prompt);
- el_set(el, EL_EDITOR, emacs);
- el_set(el, EL_SIGNAL, 1);
- el_set(el, EL_HIST, history, inhistory);
- el_source(el, NULL);
- history(inhistory, ev, H_SETSIZE, 800);
- if (inhistory == 0)
- err(1, Could not initialize history);
-
if (cap_enter() 0 errno != ENOSYS)
err(1, unable to enter capability mode);
@@ -828,6 +817,17 @@ main(int argc, char **argv)
showanswer(have, want);
}
else {
+ inhistory = history_init();
+ el = el_init(argv[0], stdin, stdout, stderr);
+ el_set(el, EL_PROMPT, prompt);
+ el_set(el, EL_EDITOR, emacs);
+ el_set(el, EL_SIGNAL, 1);
+ el_set(el, EL_HIST, history, inhistory);
+ el_source(el, NULL);
+ history(inhistory, ev, H_SETSIZE, 800);
+ if (inhistory == 0)
+ err(1, Could not initialize history);
+
if (!quiet)
printf(%d units, %d prefixes\n, unitcount,
prefixcount);
@@ -858,9 +858,10 @@ main(int argc, char **argv)
completereduce(want));
showanswer(have, want);
}
+
+ history_end(inhistory);
+ el_end(el);
}
- history_end(inhistory);
- el_end(el);
return (0);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r276423 - stable/10/share/mk
On Dec 30, 2014, at 21:46, Garrett Cooper n...@freebsd.org wrote:
Author: ngie
Date: Tue Dec 30 20:46:01 2014
New Revision: 276423
URL: https://svnweb.freebsd.org/changeset/base/276423
Log:
MFC r274077:
As an optimization (in simple, well used cases) only call cat ${.ALLSRC}
when
generating files from various sources instead of calling cat ${.ALLSRC} |
sed
Is there any visible effect to this optimization? Otherwise, the extra
complexity does not seem warranted.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273928 - head/contrib/netbsd-tests/usr.sbin/mtree
Author: jmmv
Date: Sat Nov 1 11:07:59 2014
New Revision: 273928
URL: https://svnweb.freebsd.org/changeset/base/273928
Log:
Put mtree test files into a subdirectory.
Kyua 0.11 points TMPDIR to the test's work directory, and atf_check creates
auxiliary files in TMPDIR. This confuses a couple of mtree tests that were
using the work directory's root to validate the contents of the directory.
Fix the two affected tests by creating an auxiliary directory to use for
the mtree tests. (Kyua should probably do this on its own; filed bug #133
upstream to take a look at this.)
Modified:
head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
Modified: head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh
==
--- head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh Sat Nov 1 10:50:18
2014(r273927)
+++ head/contrib/netbsd-tests/usr.sbin/mtree/t_mtree.sh Sat Nov 1 11:07:59
2014(r273928)
@@ -284,6 +284,13 @@ ignore_head()
ignore_body()
{
+ # Kyua 0.11 and above point TMPDIR to our work directory and atf-check
+ # generates a temporary file, which confuses mtree. Put the mtree files
+ # into a subdirectory.
+ #
+ # See https://github.com/jmmv/kyua/issues/133 for details.
+ mkdir root cd root
+
mkdir newdir
mtree -F ${FLAVOR} -c | mtree -F ${FLAVOR} -Ck uid,gid,mode mtree.spec
ln -s newdir otherdir
@@ -313,6 +320,13 @@ mtree_ignore_body()
}
netbsd6_ignore_body()
{
+ # Kyua 0.11 and above point TMPDIR to our work directory and atf-check
+ # generates a temporary file, which confuses mtree. Put the mtree files
+ # into a subdirectory.
+ #
+ # See https://github.com/jmmv/kyua/issues/133 for details.
+ mkdir root cd root
+
FLAVOR=netbsd6 ignore_body
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273929 - in head: . contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-c++/detail contrib/atf/atf-c/detail contrib/atf/atf-sh contrib/atf/doc contrib/atf/test-programs l...
Author: jmmv Date: Sat Nov 1 11:17:54 2014 New Revision: 273929 URL: https://svnweb.freebsd.org/changeset/base/273929 Log: MFV: Import atf-0.21. Added: head/contrib/atf/atf-c++/atf-c++.3 - copied unchanged from r273873, vendor/atf/dist/atf-c++/atf-c++.3 head/contrib/atf/atf-c/atf-c.3 - copied unchanged from r273873, vendor/atf/dist/atf-c/atf-c.3 head/contrib/atf/atf-sh/atf-sh.3 - copied unchanged from r273873, vendor/atf/dist/atf-sh/atf-sh.3 head/contrib/atf/config.h - copied, changed from r273922, head/contrib/atf/bconfig.h head/contrib/atf/doc/atf.7.in - copied unchanged from r273873, vendor/atf/dist/doc/atf.7.in Deleted: head/contrib/atf/atf-c++/config.cpp head/contrib/atf/atf-c++/config.hpp head/contrib/atf/atf-c++/config_test.cpp head/contrib/atf/atf-c++/detail/sanity_test.cpp head/contrib/atf/atf-c/config.c head/contrib/atf/atf-c/config.h head/contrib/atf/atf-c/config_test.c head/contrib/atf/bconfig.h Modified: head/ObsoleteFiles.inc head/contrib/atf/FREEBSD-Xlist head/contrib/atf/NEWS head/contrib/atf/atf-c++.hpp head/contrib/atf/atf-c++/Kyuafile head/contrib/atf/atf-c++/atf_c++_test.cpp head/contrib/atf/atf-c++/build.cpp head/contrib/atf/atf-c++/build.hpp head/contrib/atf/atf-c++/build_test.cpp head/contrib/atf/atf-c++/check.cpp head/contrib/atf/atf-c++/check.hpp head/contrib/atf/atf-c++/check_test.cpp head/contrib/atf/atf-c++/detail/Kyuafile head/contrib/atf/atf-c++/detail/application.cpp head/contrib/atf/atf-c++/detail/application.hpp head/contrib/atf/atf-c++/detail/application_test.cpp head/contrib/atf/atf-c++/detail/auto_array.hpp head/contrib/atf/atf-c++/detail/auto_array_test.cpp head/contrib/atf/atf-c++/detail/env.cpp head/contrib/atf/atf-c++/detail/env.hpp head/contrib/atf/atf-c++/detail/env_test.cpp head/contrib/atf/atf-c++/detail/exceptions.cpp head/contrib/atf/atf-c++/detail/exceptions.hpp head/contrib/atf/atf-c++/detail/exceptions_test.cpp head/contrib/atf/atf-c++/detail/fs.cpp head/contrib/atf/atf-c++/detail/fs.hpp head/contrib/atf/atf-c++/detail/fs_test.cpp head/contrib/atf/atf-c++/detail/process.cpp head/contrib/atf/atf-c++/detail/process.hpp head/contrib/atf/atf-c++/detail/process_test.cpp head/contrib/atf/atf-c++/detail/sanity.hpp head/contrib/atf/atf-c++/detail/test_helpers.cpp head/contrib/atf/atf-c++/detail/test_helpers.hpp head/contrib/atf/atf-c++/detail/text.cpp head/contrib/atf/atf-c++/detail/text.hpp head/contrib/atf/atf-c++/detail/text_test.cpp head/contrib/atf/atf-c++/detail/version_helper.cpp head/contrib/atf/atf-c++/macros.hpp head/contrib/atf/atf-c++/macros_hpp_test.cpp head/contrib/atf/atf-c++/macros_test.cpp head/contrib/atf/atf-c++/pkg_config_test.sh head/contrib/atf/atf-c++/tests.cpp head/contrib/atf/atf-c++/tests.hpp head/contrib/atf/atf-c++/tests_test.cpp head/contrib/atf/atf-c++/unused_test.cpp head/contrib/atf/atf-c++/utils.cpp head/contrib/atf/atf-c++/utils.hpp head/contrib/atf/atf-c++/utils_test.cpp head/contrib/atf/atf-c.h head/contrib/atf/atf-c/Kyuafile head/contrib/atf/atf-c/atf_c_test.c head/contrib/atf/atf-c/build.c head/contrib/atf/atf-c/build.h head/contrib/atf/atf-c/build_test.c head/contrib/atf/atf-c/check.c head/contrib/atf/atf-c/check.h head/contrib/atf/atf-c/check_test.c head/contrib/atf/atf-c/defs.h.in head/contrib/atf/atf-c/detail/dynstr.c head/contrib/atf/atf-c/detail/dynstr.h head/contrib/atf/atf-c/detail/dynstr_test.c head/contrib/atf/atf-c/detail/env.c head/contrib/atf/atf-c/detail/env.h head/contrib/atf/atf-c/detail/env_test.c head/contrib/atf/atf-c/detail/fs.c head/contrib/atf/atf-c/detail/fs.h head/contrib/atf/atf-c/detail/fs_test.c head/contrib/atf/atf-c/detail/list.c head/contrib/atf/atf-c/detail/list.h head/contrib/atf/atf-c/detail/list_test.c head/contrib/atf/atf-c/detail/map.c head/contrib/atf/atf-c/detail/map.h head/contrib/atf/atf-c/detail/map_test.c head/contrib/atf/atf-c/detail/process.c head/contrib/atf/atf-c/detail/process.h head/contrib/atf/atf-c/detail/process_helpers.c head/contrib/atf/atf-c/detail/process_test.c head/contrib/atf/atf-c/detail/sanity.c head/contrib/atf/atf-c/detail/sanity.h head/contrib/atf/atf-c/detail/sanity_test.c head/contrib/atf/atf-c/detail/test_helpers.c head/contrib/atf/atf-c/detail/test_helpers.h head/contrib/atf/atf-c/detail/text.c head/contrib/atf/atf-c/detail/text.h head/contrib/atf/atf-c/detail/text_test.c head/contrib/atf/atf-c/detail/tp_main.c head/contrib/atf/atf-c/detail/user.c head/contrib/atf/atf-c/detail/user.h head/contrib/atf/atf-c/detail/user_test.c head/contrib/atf/atf-c/detail/version_helper.c head/contrib/atf/atf-c/error.c head/contrib/atf/atf-c/error.h head/contrib/atf/atf-c/error_fwd.h head/contrib/atf/atf-c/error_test.c head/contrib/atf/atf-c/h_build.h head/contrib/atf/atf-c/macros.h head/contrib/atf/atf-c/macros_h_test.c
svn commit: r273930 - in vendor/atf: atf-0.20/atf-config atf-0.20/atf-report atf-0.20/atf-run atf-0.20/atf-version atf-0.20/tools atf-0.21/atf-config atf-0.21/atf-report atf-0.21/atf-run atf-0.21/a...
Author: jmmv Date: Sat Nov 1 11:19:50 2014 New Revision: 273930 URL: https://svnweb.freebsd.org/changeset/base/273930 Log: Remove empty directories for the deprecated (now gone) tools. The tools-related directories should have been removed with the import of atf-0.20 months ago, but I missed the bit in the Subversion Primer saying that emptied directories require manual removal. Do so now. Deleted: vendor/atf/atf-0.20/atf-config/ vendor/atf/atf-0.20/atf-report/ vendor/atf/atf-0.20/atf-run/ vendor/atf/atf-0.20/atf-version/ vendor/atf/atf-0.20/tools/ vendor/atf/atf-0.21/atf-config/ vendor/atf/atf-0.21/atf-report/ vendor/atf/atf-0.21/atf-run/ vendor/atf/atf-0.21/atf-version/ vendor/atf/atf-0.21/tools/ vendor/atf/dist/atf-config/ vendor/atf/dist/atf-report/ vendor/atf/dist/atf-run/ vendor/atf/dist/atf-version/ vendor/atf/dist/tools/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273869 - in vendor/atf/dist: . admin atf-c atf-c++ atf-c++/detail atf-c/detail atf-sh bootstrap doc m4 test-programs
Author: jmmv
Date: Thu Oct 30 17:14:07 2014
New Revision: 273869
URL: https://svnweb.freebsd.org/changeset/base/273869
Log:
Import atf-0.21:
Released on October 23rd, 2014.
* Restored the atf(7) manual page to serve as a reference to all the other
manual pages shipped by ATF.
* Added the -s flag to atf-sh to support specifying the shell interpreter
to be used.
* Removed ATF_WORKDIR. The only remaining consumers have been converted to
use the standard TMPDIR environment variable. As a benefit, and because
Kyua forces the TMPDIR to live within the test case's work directory,
any stale files left behind by ATF will be automatically cleaned up.
* Documented the environment variables recognized by each component in the
relevant manual pages. This information was lost with the atf-config(1)
removal.
* Added a new require.diskspace metadata property to test cases so that
they can specify the minimum amount of disk space required for the test
to run.
* Renamed the atf-{c,c++,sh}-api(3) manual pages to atf-{c,c++,sh}(3) for
discoverability purposes. Symbolic links are provided for the time
being to still make the old names visible.
* Issue #5: Recommend the (expected, actual) idiom for calls to the test
macros in the manual pages.
* Issue #7: Stopped catching unhandled exceptions in atf-c++ tests. This
propagates the crash to the caller, which in turn allows it to obtain
proper debugging information. In particular, Kyua should now be able to
extract a stacktrace pinpointing the problem.
* Issue #8: Fixed atf-c/macros_test:use test failures spotted by the clang
that ships with FreeBSD 11.0-CURRENT.
* Issue #12: Improved documentation of atf-sh(3) and atf-check(1) by better
explaining how they relate to each other.
* Issue #14: Stopped setting 'set -e' in atf-sh. This setting was
initially added as a way to enable a strict mode in the library and to
make test cases fail fast when they run unprotected commands. However,
doing so in the library is surprising as the responsibility of enabling
'set -e' should be on the user's code. Also, 'set -e' introduces
inconsistent behavior on subshells and users do not expect that.
* Issue #15: Fixed atf_utils_{fork,wait} to support nested calls.
* Issue #16: Fixed test failures (by removing a long-standing hack) on
systems that lack \e support in printf(1).
* Issue #19: Removed stale references to atf-config and atf-run.
Added:
vendor/atf/dist/atf-c++/atf-c++.3 (contents, props changed)
vendor/atf/dist/atf-c/atf-c.3 (contents, props changed)
vendor/atf/dist/atf-sh/atf-sh.3 (contents, props changed)
vendor/atf/dist/config.h.in (contents, props changed)
vendor/atf/dist/doc/atf.7.in (contents, props changed)
Deleted:
vendor/atf/dist/atf-c++/atf-c++-api.3
vendor/atf/dist/atf-c++/config.cpp
vendor/atf/dist/atf-c++/config.hpp
vendor/atf/dist/atf-c++/config_test.cpp
vendor/atf/dist/atf-c++/detail/sanity_test.cpp
vendor/atf/dist/atf-c/atf-c-api.3
vendor/atf/dist/atf-c/config.c
vendor/atf/dist/atf-c/config.h
vendor/atf/dist/atf-c/config_test.c
vendor/atf/dist/atf-sh/atf-sh-api.3
vendor/atf/dist/bconfig.h.in
Modified:
vendor/atf/dist/INSTALL
vendor/atf/dist/Makefile.am
vendor/atf/dist/Makefile.in
vendor/atf/dist/NEWS
vendor/atf/dist/admin/Makefile.am.inc
vendor/atf/dist/admin/check-style-c.awk
vendor/atf/dist/admin/check-style-common.awk
vendor/atf/dist/admin/check-style-cpp.awk
vendor/atf/dist/admin/check-style-man.awk
vendor/atf/dist/admin/check-style-shell.awk
vendor/atf/dist/admin/check-style.sh
vendor/atf/dist/admin/config.guess
vendor/atf/dist/admin/config.sub
vendor/atf/dist/admin/install-sh
vendor/atf/dist/admin/ltmain.sh
vendor/atf/dist/atf-c++.hpp
vendor/atf/dist/atf-c++/Kyuafile
vendor/atf/dist/atf-c++/Makefile.am.inc
vendor/atf/dist/atf-c++/atf-c++.m4
vendor/atf/dist/atf-c++/atf_c++_test.cpp
vendor/atf/dist/atf-c++/build.cpp
vendor/atf/dist/atf-c++/build.hpp
vendor/atf/dist/atf-c++/build_test.cpp
vendor/atf/dist/atf-c++/check.cpp
vendor/atf/dist/atf-c++/check.hpp
vendor/atf/dist/atf-c++/check_test.cpp
vendor/atf/dist/atf-c++/detail/Kyuafile
vendor/atf/dist/atf-c++/detail/Makefile.am.inc
vendor/atf/dist/atf-c++/detail/application.cpp
vendor/atf/dist/atf-c++/detail/application.hpp
vendor/atf/dist/atf-c++/detail/application_test.cpp
vendor/atf/dist/atf-c++/detail/auto_array.hpp
vendor/atf/dist/atf-c++/detail/auto_array_test.cpp
vendor/atf/dist/atf-c++/detail/env.cpp
vendor/atf/dist/atf-c++/detail/env.hpp
vendor/atf/dist/atf-c++/detail/env_test.cpp
vendor/atf/dist/atf-c++/detail/exceptions.cpp
vendor/atf/dist/atf-c++/detail/exceptions.hpp
vendor/atf/dist/atf-c++/detail/exceptions_test.cpp
vendor/atf/dist/atf-c++/detail/fs.cpp
vendor/atf/dist/atf-c++/detail/fs.hpp
svn commit: r273870 - vendor/atf/atf-0.21
Author: jmmv Date: Thu Oct 30 17:14:51 2014 New Revision: 273870 URL: https://svnweb.freebsd.org/changeset/base/273870 Log: Tag import of atf-0.21. Added: vendor/atf/atf-0.21/ - copied from r273869, vendor/atf/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r273873 - head/share/mk
Author: jmmv
Date: Thu Oct 30 22:07:29 2014
New Revision: 273873
URL: https://svnweb.freebsd.org/changeset/base/273873
Log:
Use the right depend file for each program.
bsd.progs.mk generates a separate depend file for every program being
built, but then it does not properly tell each submake to use those
individual files. Properly propagate the depend file to use.
Discovered while preparing the update of atf to 0.21 and noticing that
the test programs were not being relinked to the new library.
This change is make tinderbox clean.
Modified:
head/share/mk/bsd.progs.mk
Modified: head/share/mk/bsd.progs.mk
==
--- head/share/mk/bsd.progs.mk Thu Oct 30 21:21:53 2014(r273872)
+++ head/share/mk/bsd.progs.mk Thu Oct 30 22:07:29 2014(r273873)
@@ -90,12 +90,16 @@ x.$p= PROG_CXX=$p
$p ${p}_p: .PHONY .MAKE
(cd ${.CURDIR} ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
- SUBDIR= PROG=$p ${x.$p})
+ SUBDIR= PROG=$p \
+ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
+ ${x.$p})
.for t in ${PROGS_TARGETS:O:u}
$p.$t: .PHONY .MAKE
(cd ${.CURDIR} ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
- SUBDIR= PROG=$p ${x.$p} ${@:E})
+ SUBDIR= PROG=$p \
+ DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \
+ ${x.$p} ${@:E})
.endfor
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r273389 - head/contrib/netbsd-tests/lib/libc/gen
On Tue, Oct 21, 2014 at 6:56 PM, Garrett Cooper n...@freebsd.org wrote: Modified: head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c == --- head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Tue Oct 21 17:17:40 2014(r273388) +++ head/contrib/netbsd-tests/lib/libc/gen/t_siginfo.c Tue Oct 21 17:56:06 2014(r273389) @@ -29,7 +29,9 @@ #include atf-c.h #include atf-c/config.h +#if defined(__NetBSD__) Every time I see this (and checks for __FreeBSD__ as well), I can't stop wondering... why bother? This codebase lives in the FreeBSD source tree so it should be able to assume it is being built on FreeBSD. The only thing these ifdefs achieve is bloat, because there is no way their code paths will ever be executed (and thus it's guaranteed that they will rot over time). The differences between NetBSD and FreeBSD can easily be checked by diffing the vendor branch with the contrib tree. (Plus #ifdefs based on __*BSD__ macros are usually wrong because they don't account for OS release differences and thus they will certainly also break over time.) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r271950 - head/etc/mtree
Author: jmmv Date: Mon Sep 22 09:54:48 2014 New Revision: 271950 URL: http://svnweb.freebsd.org/changeset/base/271950 Log: Register /usr/tests/lib/libproc to fix build. Missed in r271937, reviewed in D710. Modified: head/etc/mtree/BSD.tests.dist Modified: head/etc/mtree/BSD.tests.dist == --- head/etc/mtree/BSD.tests.dist Mon Sep 22 09:22:58 2014 (r271949) +++ head/etc/mtree/BSD.tests.dist Mon Sep 22 09:54:48 2014 (r271950) @@ -89,6 +89,8 @@ .. libnv .. +libproc +.. libutil .. .. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r271347 - svnadmin/conf
Author: jmmv Date: Wed Sep 10 02:44:02 2014 New Revision: 271347 URL: http://svnweb.freebsd.org/changeset/base/271347 Log: Release ngie from mentorship. Modified: svnadmin/conf/mentors Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Wed Sep 10 02:35:19 2014(r271346) +++ svnadmin/conf/mentors Wed Sep 10 02:44:02 2014(r271347) @@ -27,7 +27,6 @@ kadesai ken Co-mentor: scottl, ambrisk mahrensmckusick miwi rwatson monthadar adrian -ngie jmmvCo-mentor: rpaulo odeds jhb Co-mentor: alfred peterj jhb Co-mentor: grog pkelseyjmallett ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r269665 - head/usr.bin/m4
Author: jmmv
Date: Thu Aug 7 14:26:44 2014
New Revision: 269665
URL: http://svnweb.freebsd.org/changeset/base/269665
Log:
Avoid name shadowing to fix build under powerpc64.
Error was:
cc1: warnings being treated as errors
.../usr.bin/m4/misc.c: In function 'm4errx':
.../usr.bin/m4/misc.c:268: warning: declaration of 'eval' shadows a global
declaration
.../usr.bin/m4/extern.h:40: warning: shadowed declaration is here
Modified:
head/usr.bin/m4/misc.c
Modified: head/usr.bin/m4/misc.c
==
--- head/usr.bin/m4/misc.c Thu Aug 7 12:47:25 2014(r269664)
+++ head/usr.bin/m4/misc.c Thu Aug 7 14:26:44 2014(r269665)
@@ -265,7 +265,7 @@ killdiv(void)
extern char *__progname;
void
-m4errx(int eval, const char *fmt, ...)
+m4errx(int exitstatus, const char *fmt, ...)
{
fprintf(stderr, %s: , __progname);
fprintf(stderr, %s at line %lu: , CURRENT_NAME, CURRENT_LINE);
@@ -277,7 +277,7 @@ m4errx(int eval, const char *fmt, ...)
va_end(ap);
}
fprintf(stderr, \n);
- exit(eval);
+ exit(exitstatus);
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r269412 - svnadmin/conf
Author: jmmv Date: Sat Aug 2 01:28:01 2014 New Revision: 269412 URL: http://svnweb.freebsd.org/changeset/base/269412 Log: Add Garrett Cooper (ngie@) as a src committer. Garrett will use his shiny new commit superpowers to continue working on the FreeBSD Test Suite (and probably/hopefully other things). Mentored by me and comentored by rpaulo@. Approved by: core Modified: svnadmin/conf/access svnadmin/conf/mentors Modified: svnadmin/conf/access == --- svnadmin/conf/accessSat Aug 2 00:56:34 2014(r269411) +++ svnadmin/conf/accessSat Aug 2 01:28:01 2014(r269412) @@ -159,6 +159,7 @@ mr n_hibmadevnull neel netchild +ngie np nwhitehorn nyan Modified: svnadmin/conf/mentors == --- svnadmin/conf/mentors Sat Aug 2 00:56:34 2014(r269411) +++ svnadmin/conf/mentors Sat Aug 2 01:28:01 2014(r269412) @@ -27,6 +27,7 @@ kadesai ken Co-mentor: scottl, ambrisk mahrensmckusick miwi rwatson monthadar adrian +ngie jmmvCo-mentor: rpaulo odeds jhb Co-mentor: alfred peterj jhb Co-mentor: grog pkelseyjmallett ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r268811 - in head: contrib/byacc contrib/byacc/package contrib/byacc/package/debian contrib/byacc/package/pkgsrc contrib/byacc/test contrib/byacc/test/btyacc contrib/byacc/test/yacc us
On Thu, Jul 17, 2014 at 6:22 PM, Baptiste Daroussin b...@freebsd.org wrote: Author: bapt Date: Thu Jul 17 22:22:38 2014 New Revision: 268811 URL: http://svnweb.freebsd.org/changeset/base/268811 Log: Update to byacc 20140715 (only concerns regression tests being fixed) Directly use regression test from upstream PR: 191020 Submitted by: gcooper (yaneurab...@gmail.com) Added: head/usr.bin/yacc/tests/yacc_tests.sh (contents, props changed) The tests handling in this change is severely broken. The following files were removed from /usr/tests: -/usr/tests/usr.bin/yacc/Kyuafile -/usr/tests/usr.bin/yacc/ftp.y -/usr/tests/usr.bin/yacc/legacy_test -/usr/tests/usr.bin/yacc/regress.00.out -/usr/tests/usr.bin/yacc/regress.01.out -/usr/tests/usr.bin/yacc/regress.02.out -/usr/tests/usr.bin/yacc/regress.03.out -/usr/tests/usr.bin/yacc/regress.04.out -/usr/tests/usr.bin/yacc/regress.05.out -/usr/tests/usr.bin/yacc/regress.06.out -/usr/tests/usr.bin/yacc/regress.07.out -/usr/tests/usr.bin/yacc/regress.08.out -/usr/tests/usr.bin/yacc/regress.09.out -/usr/tests/usr.bin/yacc/regress.10.out -/usr/tests/usr.bin/yacc/regress.11.out -/usr/tests/usr.bin/yacc/regress.12.out -/usr/tests/usr.bin/yacc/regress.13.out -/usr/tests/usr.bin/yacc/regress.14.out -/usr/tests/usr.bin/yacc/regress.sh -/usr/tests/usr.bin/yacc/undefined.y ... yet no entries exist in OptionalObsoleteFiles.mk for them. Also, note that the Kyuafile is now gone so these tests are useless where they are as they cannot be executed. Please fix. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r268812 - head/etc/mtree
On Thu, Jul 17, 2014 at 6:26 PM, Baptiste Daroussin b...@freebsd.org wrote: Author: bapt Date: Thu Jul 17 22:26:24 2014 New Revision: 268812 URL: http://svnweb.freebsd.org/changeset/base/268812 Log: Add the mtree entry for yacc tests Modified: head/etc/mtree/BSD.tests.dist Modified: head/etc/mtree/BSD.tests.dist == --- head/etc/mtree/BSD.tests.dist Thu Jul 17 22:22:38 2014 (r268811) +++ head/etc/mtree/BSD.tests.dist Thu Jul 17 22:26:24 2014 (r268812) @@ -266,6 +266,8 @@ xargs .. yacc +yacc +.. .. yacc within yacc? Something smells wrong. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r268794 - in head: etc/mtree usr.bin/units usr.bin/units/tests
On Thu, Jul 17, 2014 at 3:12 AM, Eitan Adler ead...@freebsd.org wrote: Author: eadler Date: Thu Jul 17 07:12:12 2014 New Revision: 268794 URL: http://svnweb.freebsd.org/changeset/base/268794 Log: units(1): Add basic tests Add some tests to help avoid breaking units Added: head/usr.bin/units/tests/ head/usr.bin/units/tests/Makefile (contents, props changed) head/usr.bin/units/tests/units_basics.sh (contents, props changed) The convention says that this file should be called basics_test.sh. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r266650 - in head: contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-sh etc/mtree lib/atf/libatf-c lib/atf/libatf-c++ lib/atf/libatf-c++/tests lib/atf/libatf-c/tests li
On Thu, Jul 24, 2014 at 6:00 PM, Alan Somers asom...@freebsd.org wrote: On Sun, May 25, 2014 at 6:01 AM, Julio Merino j...@freebsd.org wrote: Author: jmmv Date: Sun May 25 12:01:13 2014 New Revision: 266650 URL: http://svnweb.freebsd.org/changeset/base/266650 Log: Change libatf-c and libatf-c++ to be private libraries. Do you intend to MFC this change to stable/10 ? Yes, but I thought I had already done that! I have several pending MFCs to catch up with... will try to deal with them soon. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r269084 - in head: tools/build/mk usr.bin/units/tests
Author: jmmv
Date: Fri Jul 25 01:29:22 2014
New Revision: 269084
URL: http://svnweb.freebsd.org/changeset/base/269084
Log:
Fix structure of new tests (r268794) for usr.bin/units.
- Make sure the tests go into the right directory. The location was
wrong so they were overwriting the bin/chown tests!
- Use the right naming scheme for the test program.
- Remove the svn:executable property from the shell script.
Added:
- copied unchanged from r269083, head/usr.bin/units/tests/units_basics.sh
Directory Properties:
head/usr.bin/units/tests/basics_test.sh (props changed)
Deleted:
head/usr.bin/units/tests/units_basics.sh
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/units/tests/Makefile
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jul 25 00:35:43
2014(r269083)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jul 25 01:29:22
2014(r269084)
@@ -4167,6 +4167,7 @@ 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/bin/chown/units_basics
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
Modified: head/usr.bin/units/tests/Makefile
==
--- head/usr.bin/units/tests/Makefile Fri Jul 25 00:35:43 2014
(r269083)
+++ head/usr.bin/units/tests/Makefile Fri Jul 25 01:29:22 2014
(r269084)
@@ -2,8 +2,8 @@
.include bsd.own.mk
-TESTSDIR= ${TESTSBASE}/bin/chown
+TESTSDIR= ${TESTSBASE}/usr.bin/units
-TAP_TESTS_SH= units_basics
+TAP_TESTS_SH= basics_test
.include bsd.test.mk
Copied: head/usr.bin/units/tests/basics_test.sh (from r269083,
head/usr.bin/units/tests/units_basics.sh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/units/tests/basics_test.sh Fri Jul 25 01:29:22 2014
(r269084, copy of r269083, head/usr.bin/units/tests/units_basics.sh)
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+
+base=`basename $0`
+
+echo 1..3
+
+assert_equals() {
+testnum=$1
+expected=$2
+fn=$3
+if [ $expected = $($fn) ]
+then
+echo ok $testnum - $fn
+else
+echo not ok $testnum - $fn
+fi
+}
+
+assert_equals 1 1 units -t ft ft
+assert_equals 2 12 units -t ft in
+assert_equals 3 0.08333 units -t in ft
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r268794 - in head: etc/mtree usr.bin/units usr.bin/units/tests
On Thu, Jul 24, 2014 at 3:55 PM, Eitan Adler ead...@freebsd.org wrote: My computer is out of commission at the moment. Would you mind making this change for me? Thanks for letting me know! Renamed. And also fixed the value of TESTSDIR to get these tests in the right place. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r268770 - head/libexec/rtld-elf/tests/libpythagoras
Author: jmmv
Date: Wed Jul 16 16:42:58 2014
New Revision: 268770
URL: http://svnweb.freebsd.org/changeset/base/268770
Log:
libpythagoras needs libm.
This fixes make tinderbox failures on various architectures when
WITH_TESTS=yes is enabled. Problem introduced in r267679.
Modified:
head/libexec/rtld-elf/tests/libpythagoras/Makefile
Modified: head/libexec/rtld-elf/tests/libpythagoras/Makefile
==
--- head/libexec/rtld-elf/tests/libpythagoras/Makefile Wed Jul 16 16:38:25
2014(r268769)
+++ head/libexec/rtld-elf/tests/libpythagoras/Makefile Wed Jul 16 16:42:58
2014(r268770)
@@ -10,4 +10,7 @@ SHLIBDIR= ${TESTSBASE}${TESTSDIR}/libexe
SRCS= pythagoras.c
+DPADD= ${LIBM}
+LDADD= -lm
+
.include bsd.lib.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267679 - in head: etc/mtree libexec/rtld-elf libexec/rtld-elf/tests libexec/rtld-elf/tests/libpythagoras libexec/rtld-elf/tests/target
On Mon, Jul 14, 2014 at 7:35 PM, Julio Merino j...@freebsd.org wrote: On Fri, Jun 20, 2014 at 1:14 PM, Jonathan Anderson jonat...@freebsd.org wrote: Author: jonathan Date: Fri Jun 20 17:14:59 2014 New Revision: 267679 URL: http://svnweb.freebsd.org/changeset/base/267679 Log: Test RTLD's new LD_LIBRARY_PATH_FDS variable. This breaks make tinderbox when WITH_TESTS is set. Fixed in r268770. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r268778 - in head: share/mk tools/build/options
Author: jmmv Date: Wed Jul 16 21:40:11 2014 New Revision: 268778 URL: http://svnweb.freebsd.org/changeset/base/268778 Log: Enable MK_TESTS by default, take 2. This is a redo of r267424, which was reverted in r267432 because it broke make buildworld from FreeBSD 9.x. This issue has been resolved and this change is still make tinderbox clean. Added: head/tools/build/options/WITHOUT_TESTS - copied, changed from r268619, head/tools/build/options/WITH_TESTS Deleted: head/tools/build/options/WITH_TESTS Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk == --- head/share/mk/src.opts.mk Wed Jul 16 21:26:26 2014(r268777) +++ head/share/mk/src.opts.mk Wed Jul 16 21:40:11 2014(r268778) @@ -144,6 +144,7 @@ __DEFAULT_YES_OPTIONS = \ SYSINSTALL \ TCSH \ TELNET \ +TESTS \ TEXTPROC \ UNBOUND \ USB \ @@ -169,7 +170,6 @@ __DEFAULT_NO_OPTIONS = \ SHARED_TOOLCHAIN \ SORT_THREADS \ SVN \ -TESTS \ USB_GADGET_EXAMPLES # Copied and modified: head/tools/build/options/WITHOUT_TESTS (from r268619, head/tools/build/options/WITH_TESTS) == --- head/tools/build/options/WITH_TESTS Mon Jul 14 12:24:38 2014 (r268619, copy source) +++ head/tools/build/options/WITHOUT_TESTS Wed Jul 16 21:40:11 2014 (r268778) @@ -1,8 +1,9 @@ .\ $FreeBSD$ -Set to install the +Set to not build nor install the .Fx Test Suite in .Pa /usr/tests/ . See .Xr tests 7 for more details. +This also disables the build of all test-related dependencies, including ATF. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r268779 - head/share/man/man5
Author: jmmv Date: Wed Jul 16 21:43:24 2014 New Revision: 268779 URL: http://svnweb.freebsd.org/changeset/base/268779 Log: Regen after r268778 to replace WITH_TESTS with WITHOUT_TESTS. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Wed Jul 16 21:40:11 2014 (r268778) +++ head/share/man/man5/src.conf.5 Wed Jul 16 21:43:24 2014 (r268779) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. .\ from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\ $FreeBSD$ -.Dd July 10, 2014 +.Dd July 16, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -346,6 +346,8 @@ When set, it also enforces the following .It .Va WITHOUT_CLANG_FULL .It +.Va WITHOUT_GNUCXX +.It .Va WITHOUT_GROFF .El .It Va WITH_DEBUG_FILES @@ -1021,15 +1023,16 @@ Set to not build and install Set to not build .Xr telnet 8 and related programs. -.It Va WITH_TESTS -.\ from FreeBSD: head/tools/build/options/WITH_TESTS 267432 2014-06-13 00:05:06Z gjb -Set to install the +.It Va WITHOUT_TESTS +.\ from FreeBSD: head/tools/build/options/WITHOUT_TESTS 268778 2014-07-16 21:40:11Z jmmv +Set to not build nor install the .Fx Test Suite in .Pa /usr/tests/ . See .Xr tests 7 for more details. +This also disables the build of all test-related dependencies, including ATF. .It Va WITHOUT_TEXTPROC .\ from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam Set to not build ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r268779 - head/share/man/man5
On Wed, Jul 16, 2014 at 6:16 PM, Baptiste Daroussin b...@freebsd.org wrote: On Wed, Jul 16, 2014 at 09:43:24PM +, Julio Merino wrote: Author: jmmv Date: Wed Jul 16 21:43:24 2014 New Revision: 268779 URL: http://svnweb.freebsd.org/changeset/base/268779 Log: Regen after r268778 to replace WITH_TESTS with WITHOUT_TESTS. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5Wed Jul 16 21:40:11 2014 (r268778) +++ head/share/man/man5/src.conf.5Wed Jul 16 21:43:24 2014 (r268779) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. .\ from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\ $FreeBSD$ -.Dd July 10, 2014 +.Dd July 16, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -346,6 +346,8 @@ When set, it also enforces the following .It .Va WITHOUT_CLANG_FULL .It +.Va WITHOUT_GNUCXX +.It The above looks unintended? I don't know. That came from running the makeman script and I was just trusting it to be right. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r268620 - head/lib/libc/net
Author: jmmv
Date: Mon Jul 14 13:53:10 2014
New Revision: 268620
URL: http://svnweb.freebsd.org/changeset/base/268620
Log:
Make generation of nslexer.c more robust.
Ensure that lex errors fail the build instead of being silently ignored
due to the piped call. Also postpone the update of the nslexer.c file
until we are sure we have generated it properly.
These changes fix some very obscure build failures I encountered while
building FreeBSD within a chroot that did not have devfs mounted. The
specific errors looked like:
.../libc.so.7: undefined reference to `_nsyyerror'
.../libc.so.7: undefined reference to `_nsyyin'
.../libc.so.7: undefined reference to `_nsyylex'
.../libc.so.7: undefined reference to `_nsyylineno'
.../libc.so.7: undefined reference to `_nsyytext'
and were caused due to a mangled nslexer.c being linked into libc.
Modified:
head/lib/libc/net/Makefile.inc
Modified: head/lib/libc/net/Makefile.inc
==
--- head/lib/libc/net/Makefile.inc Mon Jul 14 12:24:38 2014
(r268619)
+++ head/lib/libc/net/Makefile.inc Mon Jul 14 13:53:10 2014
(r268620)
@@ -34,11 +34,13 @@ CFLAGS+=-I${LIBC_SRCTOP}/resolv
YFLAGS+=-p_nsyy
LFLAGS+=-P_nsyy
-CLEANFILES+=nslexer.c
+CLEANFILES+=nslexer.c nslexer.c.*
nslexer.c: nslexer.l nsparser.h
- ${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \
- sed -e '/YY_BUF_SIZE/s/16384/1024/' ${.TARGET}
+ ${LEX} ${LFLAGS} -o${.TARGET}.tmp1 ${.IMPSRC}
+ sed -e '/YY_BUF_SIZE/s/16384/1024/' ${.TARGET}.tmp1 ${.TARGET}.tmp2
+ rm -f ${.TARGET}.tmp1
+ mv -f ${.TARGET}.tmp2 ${.TARGET}
MAN+= byteorder.3 ethers.3 eui64.3 \
getaddrinfo.3 gai_strerror.3 gethostbyname.3 \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267679 - in head: etc/mtree libexec/rtld-elf libexec/rtld-elf/tests libexec/rtld-elf/tests/libpythagoras libexec/rtld-elf/tests/target
On Fri, Jun 20, 2014 at 1:14 PM, Jonathan Anderson jonat...@freebsd.org wrote: Author: jonathan Date: Fri Jun 20 17:14:59 2014 New Revision: 267679 URL: http://svnweb.freebsd.org/changeset/base/267679 Log: Test RTLD's new LD_LIBRARY_PATH_FDS variable. This breaks make tinderbox when WITH_TESTS is set. For example, from an arm build: === libexec/rtld-elf (all) === libexec/rtld-elf/tests (all) === libexec/rtld-elf/tests/libpythagoras (all) === libexec/rtld-elf/tests/target (all) /scratch/tmp/jmmv/obj/arm.arm/scratch/tmp/jmmv/base/head/libexec/rtld-elf/tests/target/../libpythagoras/libpythagoras.so: undefined reference to `sqrt' cc: error: linker command failed with exit code 1 (use -v to see invocation) --- target --- *** [target] Error code 1 make[8]: stopped in /scratch/tmp/jmmv/base/head/libexec/rtld-elf/tests/target 1 error ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r268598 - head
Author: jmmv
Date: Sun Jul 13 23:53:41 2014
New Revision: 268598
URL: http://svnweb.freebsd.org/changeset/base/268598
Log:
Explicitly disable the build of tests when building bmake.
During make buildworld, building bmake is (one of) the very first steps
and we should not be building any of its tests. Conceptually, this is the
right thing to do 1) for build simplicity reasons and 2) because there is
no need to build any tests this early on.
In practice, this fixes tinderbox builds of CURRENT from 9.x when MK_TESTS
is enabled. This is because bsd.test.mk needs some modern bmake features
not present in 9.x (:tW) and tinderbox is forcing the build to use the
CURRENT share/mk files from the very beginning (see r266617). By skipping
the build of the tests when still using the host make, we omit the problem.
Arguably, what tinderbox is doing is wrong and needs to be addressed, but
that is a separate issue.
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Sun Jul 13 23:10:39 2014(r268597)
+++ head/Makefile Sun Jul 13 23:53:41 2014(r268598)
@@ -331,6 +331,7 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
MMAKE= ${MMAKEENV} ${MAKE} \
-DNO_MAN -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR \
+ MK_TESTS=no \
DESTDIR= PROGNAME=${MYMAKE:T}
bmake: .PHONY
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267424 - in head: share/mk tools/build/options
On Fri, Jul 11, 2014 at 8:17 PM, Julio Merino j...@freebsd.org wrote: On Tue, Jul 8, 2014 at 10:34 PM, Julio Merino j...@freebsd.org wrote: OK. Regardless, I suppose that being able to build HEAD from the supported releases is supposed to work? Even from 8.4? Will investigate for 9.x. Alright. I could reproduce this... but it was not obvious. A make buildworld with WITH_TESTS=yes from 9.3_RC3 works *just fine*. The problem is that tinderbox is setting MAKESYSPATH=/path/to/src/share/mk and this seems to cause the build system to not compile and use the bmake that is in current, instead relying on the host make (/usr/bin/make). This is a problem because the -current *.test.mk use the :tW modifier which is not present in the bmake version shipped in 9.x. Fixed in r268598. I don't think tinderbox is doing the right thing though. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267424 - in head: share/mk tools/build/options
On Tue, Jul 8, 2014 at 10:34 PM, Julio Merino j...@freebsd.org wrote: OK. Regardless, I suppose that being able to build HEAD from the supported releases is supposed to work? Even from 8.4? Will investigate for 9.x. Alright. I could reproduce this... but it was not obvious. A make buildworld with WITH_TESTS=yes from 9.3_RC3 works *just fine*. The problem is that tinderbox is setting MAKESYSPATH=/path/to/src/share/mk and this seems to cause the build system to not compile and use the bmake that is in current, instead relying on the host make (/usr/bin/make). This is a problem because the -current *.test.mk use the :tW modifier which is not present in the bmake version shipped in 9.x. So what's the bug here? Should *.test.mk stop using :tW or is tinderbox broken because it's bypassing the build of a current bmake (which is bound to cause problems in an older system)? I'd call the bug is the latter because make buildworld works just fine... ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r268445 - in head: libexec/atf/atf-sh/tests share/mk
Author: jmmv
Date: Wed Jul 9 00:55:50 2014
New Revision: 268445
URL: http://svnweb.freebsd.org/changeset/base/268445
Log:
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
Modified:
head/libexec/atf/atf-sh/tests/Makefile
head/share/mk/atf.test.mk
head/share/mk/plain.test.mk
head/share/mk/tap.test.mk
Modified: head/libexec/atf/atf-sh/tests/Makefile
==
--- head/libexec/atf/atf-sh/tests/Makefile Wed Jul 9 00:12:56 2014
(r268444)
+++ head/libexec/atf/atf-sh/tests/Makefile Wed Jul 9 00:55:50 2014
(r268445)
@@ -10,12 +10,15 @@ 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
+integration_test: Makefile
+ATF_TESTS_SH_SED_integration_test= \
+-e 's,atf_check,PATH=/usr/libexec:$${PATH} atf_check,g' \
+-e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
+
SCRIPTS+= misc_helpers
SCRIPTSDIR_misc_helpers=${TESTSDIR}
CLEANFILES+= misc_helpers misc_helpers.tmp
Modified: head/share/mk/atf.test.mk
==
--- head/share/mk/atf.test.mk Wed Jul 9 00:12:56 2014(r268444)
+++ head/share/mk/atf.test.mk Wed Jul 9 00:55:50 2014(r268445)
@@ -105,7 +105,8 @@ ATF_TESTS_SH_SED_${_T}?= # empty
ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
${_T}: ${ATF_TESTS_SH_SRC_${_T}}
echo '#! /usr/libexec/atf-sh' ${.TARGET}.tmp
- cat ${.ALLSRC} | sed ${ATF_TESTS_SH_SED_${_T}} ${.TARGET}.tmp
+ cat ${.ALLSRC:N*Makefile*} \
+ | sed ${ATF_TESTS_SH_SED_${_T}} ${.TARGET}.tmp
chmod +x ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
.endfor
Modified: head/share/mk/plain.test.mk
==
--- head/share/mk/plain.test.mk Wed Jul 9 00:12:56 2014(r268444)
+++ head/share/mk/plain.test.mk Wed Jul 9 00:55:50 2014(r268445)
@@ -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: head/share/mk/tap.test.mk
==
--- head/share/mk/tap.test.mk Wed Jul 9 00:12:56 2014(r268444)
+++ head/share/mk/tap.test.mk Wed Jul 9 00:55:50 2014(r268445)
@@ -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}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267424 - in head: share/mk tools/build/options
On Thu, Jun 12, 2014 at 8:20 PM, Glen Barber g...@freebsd.org wrote: On Thu, Jun 12, 2014 at 07:56:47PM -0400, Glen Barber wrote: On Thu, Jun 12, 2014 at 06:54:53PM +, Julio Merino wrote: Author: jmmv Date: Thu Jun 12 18:54:52 2014 New Revision: 267424 URL: http://svnweb.freebsd.org/changeset/base/267424 Log: Enable MK_TESTS by default. This was never intended to be off by default but was done this way because the initial patches broke the build. Things seem stable now (have been so for a while too) and make tinderbox is clean so let's try again. Announced in freebsd-current; all reported shortcomings have been addressed. Unless you do it in the next 5 minutes, I will revert this to shut up the tinderbox mail. Sorry, had to revert this. The tinderbox is unhappy. Where can I find any details about what failed? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267424 - in head: share/mk tools/build/options
On Tue, Jul 8, 2014 at 9:07 PM, Glen Barber g...@freebsd.org wrote: This is one of the build failure cases: https://lists.freebsd.org/pipermail/freebsd-tinderbox/2014-June/014357.html Am I reading that right in that this was on a 9.2-STABLE host building HEAD? ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r267424 - in head: share/mk tools/build/options
On Tue, Jul 8, 2014 at 10:32 PM, Glen Barber g...@freebsd.org wrote: On Tue, Jul 08, 2014 at 10:28:25PM -0400, Julio Merino wrote: On Tue, Jul 8, 2014 at 9:07 PM, Glen Barber g...@freebsd.org wrote: This is one of the build failure cases: https://lists.freebsd.org/pipermail/freebsd-tinderbox/2014-June/014357.html Am I reading that right in that this was on a 9.2-STABLE host building HEAD? Yes. (I have no idea why, to be honest. The tinderbox are outside of the cluster admins control.) OK. Regardless, I suppose that being able to build HEAD from the supported releases is supposed to work? Even from 8.4? Will investigate for 9.x. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267424 - in head: share/mk tools/build/options
Author: jmmv Date: Thu Jun 12 18:54:52 2014 New Revision: 267424 URL: http://svnweb.freebsd.org/changeset/base/267424 Log: Enable MK_TESTS by default. This was never intended to be off by default but was done this way because the initial patches broke the build. Things seem stable now (have been so for a while too) and make tinderbox is clean so let's try again. Announced in freebsd-current; all reported shortcomings have been addressed. Added: head/tools/build/options/WITHOUT_TESTS - copied, changed from r267422, head/tools/build/options/WITH_TESTS Deleted: head/tools/build/options/WITH_TESTS Modified: head/share/mk/src.opts.mk Modified: head/share/mk/src.opts.mk == --- head/share/mk/src.opts.mk Thu Jun 12 18:31:32 2014(r267423) +++ head/share/mk/src.opts.mk Thu Jun 12 18:54:52 2014(r267424) @@ -143,6 +143,7 @@ __DEFAULT_YES_OPTIONS = \ SYSINSTALL \ TCSH \ TELNET \ +TESTS \ TEXTPROC \ UNBOUND \ USB \ @@ -168,7 +169,6 @@ __DEFAULT_NO_OPTIONS = \ SHARED_TOOLCHAIN \ SORT_THREADS \ SVN \ -TESTS \ USB_GADGET_EXAMPLES # Copied and modified: head/tools/build/options/WITHOUT_TESTS (from r267422, head/tools/build/options/WITH_TESTS) == --- head/tools/build/options/WITH_TESTS Thu Jun 12 17:22:04 2014 (r267422, copy source) +++ head/tools/build/options/WITHOUT_TESTS Thu Jun 12 18:54:52 2014 (r267424) @@ -1,8 +1,9 @@ .\ $FreeBSD$ -Set to install the +Set to not build nor install the .Fx Test Suite in .Pa /usr/tests/ . See .Xr tests 7 for more details. +This also disables the build of all test-related dependencies, including ATF. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267425 - head/share/man/man5
Author: jmmv Date: Thu Jun 12 18:59:25 2014 New Revision: 267425 URL: http://svnweb.freebsd.org/changeset/base/267425 Log: Regen after r267424 to replace WITH_TESTS with WITHOUT_TESTS. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Thu Jun 12 18:54:52 2014 (r267424) +++ head/share/man/man5/src.conf.5 Thu Jun 12 18:59:25 2014 (r267425) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. .\ from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\ $FreeBSD$ -.Dd June 8, 2014 +.Dd June 11, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1021,15 +1021,16 @@ Set to not build and install Set to not build .Xr telnet 8 and related programs. -.It Va WITH_TESTS -.\ from FreeBSD: head/tools/build/options/WITH_TESTS 267033 2014-06-03 22:34:27Z jmmv -Set to install the +.It Va WITHOUT_TESTS +.\ from FreeBSD: head/tools/build/options/WITHOUT_TESTS 267424 2014-06-12 18:54:52Z jmmv +Set to not build nor install the .Fx Test Suite in .Pa /usr/tests/ . See .Xr tests 7 for more details. +This also disables the build of all test-related dependencies, including ATF. .It Va WITHOUT_TEXTPROC .\ from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam Set to not build ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267331 - in head: . etc share/mk
Author: jmmv
Date: Tue Jun 10 17:04:30 2014
New Revision: 267331
URL: http://svnweb.freebsd.org/changeset/base/267331
Log:
Put the test suite in its own tests.txz distribution file.
Force all the contents of /usr/tests to go into a separate distribution
file so that users of binary releases can easily choose to not install it.
To make this possible, we need two fixes:
- bsd.subdir.mk needs to properly honor NO_SUBDIR in all cases so that we
do not recurse into 'tests' subdirectories when we needn't. Otherwise,
we end up with some Kyuafiles in base.txz.
- etc/Makefile needs to skip installing tests in its 'distribute' target
so that a Kyuafile doesn't leak into base.txz.
Approved by: gjb
Modified:
head/Makefile.inc1
head/etc/Makefile
head/share/mk/bsd.subdir.mk
head/share/mk/bsd.test.mk
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Tue Jun 10 16:45:58 2014(r267330)
+++ head/Makefile.inc1 Tue Jun 10 17:04:30 2014(r267331)
@@ -776,6 +776,9 @@ EXTRA_DISTRIBUTIONS+= games
.if defined(LIB32TMP) ${MK_LIB32} != no
EXTRA_DISTRIBUTIONS+= lib32
.endif
+.if ${MK_TESTS} != no
+EXTRA_DISTRIBUTIONS+= tests
+.endif
MTREE_MAGIC?= mtree 2.0
@@ -817,6 +820,10 @@ distributeworld installworld: _installch
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib /dev/null
.endif
+.if ${MK_TESTS} != no ${dist} == tests
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+ -p ${DESTDIR}/${DISTDIR}/${dist}/usr /dev/null
+.endif
.if defined(NO_ROOT)
${IMAKEENV} mtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
sed -e 's#^\./#./${dist}/#' ${METALOG}
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Jun 10 16:45:58 2014(r267330)
+++ head/etc/Makefile Tue Jun 10 17:04:30 2014(r267331)
@@ -174,7 +174,10 @@ afterinstall:
.endif
distribute:
- ${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION}
+ # Avoid installing tests here; make distribution will do this and
+ # correctly place them in the right location.
+ ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
+ DESTDIR=${DISTDIR}/${DISTRIBUTION}
${_+_}cd ${.CURDIR} ; ${MAKE} distribution
DESTDIR=${DISTDIR}/${DISTRIBUTION}
.include bsd.endian.mk
Modified: head/share/mk/bsd.subdir.mk
==
--- head/share/mk/bsd.subdir.mk Tue Jun 10 16:45:58 2014(r267330)
+++ head/share/mk/bsd.subdir.mk Tue Jun 10 17:04:30 2014(r267331)
@@ -81,6 +81,7 @@ __subdir_targets+= .WAIT
.else
__subdir_targets+= ${__target}_subdir_${__dir}
${__target}_subdir_${__dir}: .MAKE
+.if !defined(NO_SUBDIR)
@${_+_}set -e; \
if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
${ECHODIR} === ${DIRPRFX}${__dir}.${MACHINE_ARCH}
(${__target:realinstall=install}); \
@@ -94,6 +95,7 @@ ${__target}_subdir_${__dir}: .MAKE
${MAKE} ${__target:realinstall=install} \
DIRPRFX=${DIRPRFX}$$edir/
.endif
+.endif
.endfor
${__target}: ${__subdir_targets}
.else
Modified: head/share/mk/bsd.test.mk
==
--- head/share/mk/bsd.test.mk Tue Jun 10 16:45:58 2014(r267330)
+++ head/share/mk/bsd.test.mk Tue Jun 10 17:04:30 2014(r267331)
@@ -27,6 +27,15 @@ TESTS_SUBDIRS?=
# List of variables to pass to the tests at run-time via the environment.
TESTS_ENV?=
+# Force all tests in a separate distribution file.
+#
+# We want this to be the case even when the distribution name is already
+# overriden. For example: we want the tests for programs in the 'games'
+# distribution to end up in the 'tests' distribution; the test programs
+# themselves have all the necessary logic to detect that the games are not
+# installed and thus won't cause false negatives.
+DISTRIBUTION:= tests
+
# Ordered list of directories to construct the PATH for the tests.
TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \
${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267332 - head/release
Author: jmmv
Date: Tue Jun 10 17:05:41 2014
New Revision: 267332
URL: http://svnweb.freebsd.org/changeset/base/267332
Log:
Strip out the test suite from the installation media.
This affects the disc1.iso, dvd1.iso and bootonly.iso files.
Obtained from:gjb
Modified:
head/release/Makefile
Modified: head/release/Makefile
==
--- head/release/Makefile Tue Jun 10 17:04:30 2014(r267331)
+++ head/release/Makefile Tue Jun 10 17:05:41 2014(r267332)
@@ -155,7 +155,7 @@ system: packagesystem
mkdir -p release
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
- WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1
WITHOUT_LIB32=1
+ WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
# Copy distfiles
mkdir -p release/usr/freebsd-dist
cp *.txz MANIFEST release/usr/freebsd-dist
@@ -180,7 +180,7 @@ bootonly: packagesystem
WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \
WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \
WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \
- WITHOUT_KERNEL_SYMBOLS=1
+ WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no
# Copy manifest only (no distfiles) to get checksums
mkdir -p bootonly/usr/freebsd-dist
cp MANIFEST bootonly/usr/freebsd-dist
@@ -199,7 +199,8 @@ dvd:
# Install system
mkdir -p ${.TARGET}
cd ${WORLDDIR} ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1
+ DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
+ MK_TESTS=no
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267276 - head/share/mk
Author: jmmv
Date: Mon Jun 9 14:36:49 2014
New Revision: 267276
URL: http://svnweb.freebsd.org/changeset/base/267276
Log:
Ensure files are created during the build when using bsd.subdir.mk.
When FILES is defined in a Makefile that _also_ includes bsd.subdir.mk, the
build of the files (if any) was not properly triggered during the build
stage. This was because bsd.files.mk did not define the buildfiles target
if it was already defined... and bsd.subdir.mk defined this target on its
own, thus causing a conflict.
Fix this by unconditionally defining buildfiles from bsd.files.mk; this is
safe because nothing else in the tree needs to redefine this and because the
target itself contains no commands: all it does is define dependencies.
Also ensure that bsd.files.mk is always pulled in by bsd.test.mk regardless
of what bsd.prog.mk does.
These fixes allow make installworld to run cleanly on a system with
read-only src and obj trees.
This is make tinderbox clean.
Reviewed by: imp
Obtained from:jilles
Modified:
head/share/mk/bsd.files.mk
head/share/mk/bsd.test.mk
Modified: head/share/mk/bsd.files.mk
==
--- head/share/mk/bsd.files.mk Mon Jun 9 14:34:33 2014(r267275)
+++ head/share/mk/bsd.files.mk Mon Jun 9 14:36:49 2014(r267276)
@@ -4,13 +4,14 @@
.error bsd.files.mk cannot be included directly.
.endif
+.if !target(__bsd.files.mk__)
+__bsd.files.mk__:
+
FILESGROUPS?= FILES
-.if !target(buildfiles)
.for group in ${FILESGROUPS}
buildfiles: ${${group}}
.endfor
-.endif
all: buildfiles
@@ -65,3 +66,5 @@ _${group}INS: ${_${group}FILES}
realinstall: installfiles
.ORDER: beforeinstall installfiles
+
+.endif # !target(__bsd.files.mk__)
Modified: head/share/mk/bsd.test.mk
==
--- head/share/mk/bsd.test.mk Mon Jun 9 14:34:33 2014(r267275)
+++ head/share/mk/bsd.test.mk Mon Jun 9 14:36:49 2014(r267276)
@@ -82,8 +82,7 @@ test: aftertest
.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS)
.include bsd.progs.mk
-.elif !empty(FILES)
-.include bsd.files.mk
.endif
+.include bsd.files.mk
.include bsd.obj.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267172 - in head: . lib/atf/libatf-c lib/atf/libatf-c++ tools/build/mk
Author: jmmv
Date: Fri Jun 6 17:05:43 2014
New Revision: 267172
URL: http://svnweb.freebsd.org/changeset/base/267172
Log:
Homogenize libatf-* version numbers with upstream.
The libatf-* major version numbers in FreeBSD were one version ahead of
upstream because, when atf was first imported into FreeBSD, the upstream
numbers were not respected. This is just confusing and bound to cause
problems down the road.
Fix this by taking advantage of the fact that libatf-* are now private
and that atf is not yet built by default. However, and unfortunately, a
clean build is needed for tests to continue working once make
delete-old-libs has been run; hence the note in UPDATING.
Modified:
head/UPDATING
head/lib/atf/libatf-c++/Makefile
head/lib/atf/libatf-c/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/UPDATING
==
--- head/UPDATING Fri Jun 6 16:37:42 2014(r267171)
+++ head/UPDATING Fri Jun 6 17:05:43 2014(r267172)
@@ -31,6 +31,22 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
ln -s 'abort:false,junk:false' /etc/malloc.conf.)
+20140606:
+ The libatf-c and libatf-c++ major versions were downgraded to 0 and
+ 1 respectively to match the upstream numbers. They were out of
+ sync because, when they were originally added to FreeBSD, the
+ upstream versions were not respected. These libraries are private
+ and not yet built by default, so renumbering them should be a
+ non-issue. However, unclean source trees will yield broken test
+ programs once the operator executes make delete-old-libs after a
+ make installworld.
+
+ 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.
+
20140512:
Clang and llvm have been upgraded to 3.4.1 release.
Modified: head/lib/atf/libatf-c++/Makefile
==
--- head/lib/atf/libatf-c++/MakefileFri Jun 6 16:37:42 2014
(r267171)
+++ head/lib/atf/libatf-c++/MakefileFri Jun 6 17:05:43 2014
(r267172)
@@ -30,7 +30,7 @@
LIB= atf-c++
PRIVATELIB=true
-SHLIB_MAJOR= 2
+SHLIB_MAJOR= 1
# libatf-c++ depends on the C version of the ATF library to build.
DPADD= ${LIBATFC}
Modified: head/lib/atf/libatf-c/Makefile
==
--- head/lib/atf/libatf-c/Makefile Fri Jun 6 16:37:42 2014
(r267171)
+++ head/lib/atf/libatf-c/Makefile Fri Jun 6 17:05:43 2014
(r267172)
@@ -30,7 +30,7 @@
LIB= atf-c
PRIVATELIB=true
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 0
ATF= ${.CURDIR:H:H:H}/contrib/atf
.PATH: ${ATF}
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 6 16:37:42
2014(r267171)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 6 17:05:43
2014(r267172)
@@ -4112,6 +4112,8 @@ OLD_LIBS+=usr/lib/libatf-c.a
OLD_LIBS+=usr/lib/libatf-c.so
OLD_LIBS+=usr/lib/libatf-c.so.1
OLD_LIBS+=usr/lib/libatf-c_p.a
+OLD_LIBS+=usr/lib/private/libatf-c.so.1
+OLD_LIBS+=usr/lib/private/libatf-c++.so.2
.if ${TARGET_ARCH} == amd64 || ${TARGET_ARCH} == powerpc64
OLD_LIBS+=usr/lib32/libatf-c++.a
OLD_LIBS+=usr/lib32/libatf-c++.so
@@ -4122,6 +4124,8 @@ OLD_LIBS+=usr/lib32/libatf-c.a
OLD_LIBS+=usr/lib32/libatf-c.so
OLD_LIBS+=usr/lib32/libatf-c.so.1
OLD_LIBS+=usr/lib32/libatf-c_p.a
+OLD_LIBS+=usr/lib32/private/libatf-c.so.1
+OLD_LIBS+=usr/lib32/private/libatf-c++.so.2
.endif
OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r267176 - head/share/mk
Author: jmmv
Date: Fri Jun 6 17:53:05 2014
New Revision: 267176
URL: http://svnweb.freebsd.org/changeset/base/267176
Log:
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.)
Modified:
head/share/mk/atf.test.mk
Modified: head/share/mk/atf.test.mk
==
--- head/share/mk/atf.test.mk Fri Jun 6 17:42:55 2014(r267175)
+++ head/share/mk/atf.test.mk Fri Jun 6 17:53:05 2014(r267176)
@@ -98,10 +98,14 @@ _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
+ cat ${.ALLSRC} | sed ${ATF_TESTS_SH_SED_${_T}} ${.TARGET}.tmp
chmod +x ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
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
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+=
svn commit: r267033 - in head: share/man/man5 tools/build/options
Author: jmmv Date: Tue Jun 3 22:34:27 2014 New Revision: 267033 URL: http://svnweb.freebsd.org/changeset/base/267033 Log: Merge (unused) documentation of WITHOUT_TESTS into WITH_TESTS. The description of WITH/WITHOUT tweaks should only document the non-default option. TESTS still defaults to no, so the option to be documented is WITH_TESTS. Deleted: head/tools/build/options/WITHOUT_TESTS Modified: head/share/man/man5/src.conf.5 head/tools/build/options/WITH_TESTS Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Tue Jun 3 22:26:46 2014 (r267032) +++ head/share/man/man5/src.conf.5 Tue Jun 3 22:34:27 2014 (r267033) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. .\ from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\ $FreeBSD$ -.Dd May 27, 2014 +.Dd June 3, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1022,7 +1022,8 @@ and related programs. .\ from FreeBSD: head/tools/build/options/WITH_TESTS 264408 2014-04-13 11:29:52Z jmmv Set to install the .Fx -Test Suite. +Test Suite in +.Pa /usr/tests/ . See .Xr tests 7 for more details. Modified: head/tools/build/options/WITH_TESTS == --- head/tools/build/options/WITH_TESTS Tue Jun 3 22:26:46 2014 (r267032) +++ head/tools/build/options/WITH_TESTS Tue Jun 3 22:34:27 2014 (r267033) @@ -1,7 +1,8 @@ .\ $FreeBSD$ Set to install the .Fx -Test Suite. +Test Suite in +.Pa /usr/tests/ . See .Xr tests 7 for more details. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r266650 - in head: contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-sh etc/mtree lib/atf/libatf-c lib/atf/libatf-c++ lib/atf/libatf-c++/tests lib/atf/libatf-c/tests lib...
Author: jmmv
Date: Sun May 25 12:01:13 2014
New Revision: 266650
URL: http://svnweb.freebsd.org/changeset/base/266650
Log:
Change libatf-c and libatf-c++ to be private libraries.
We should not be leaking these interfaces to the outside world given
that it's much easier for third-party components to use the devel/atf
package from ports.
As a side-effect, we can also drop the ATF pkgconfig and aclocal files
from the base system. Nothing in the base system needs these, and it
was quite ugly to have to get them installed only so that a few ports
could build. The offending ports have been fixed to depend on
devel/atf explicitly.
Reviewed by: bapt
Deleted:
head/contrib/atf/atf-c++/atf-c++.m4
head/contrib/atf/atf-c++/atf-c++.pc.in
head/contrib/atf/atf-c/atf-c.m4
head/contrib/atf/atf-c/atf-c.pc.in
head/contrib/atf/atf-c/atf-common.m4
head/contrib/atf/atf-sh/atf-sh.m4
head/contrib/atf/atf-sh/atf-sh.pc.in
Modified:
head/contrib/atf/FREEBSD-Xlist
head/etc/mtree/BSD.tests.dist
head/lib/atf/libatf-c++/Makefile
head/lib/atf/libatf-c++/tests/Makefile
head/lib/atf/libatf-c/Makefile
head/lib/atf/libatf-c/tests/Makefile
head/libexec/atf/atf-check/Makefile
head/share/mk/atf.test.mk
head/share/mk/bsd.libnames.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/atf/atf-sh/Makefile
Modified: head/contrib/atf/FREEBSD-Xlist
==
--- head/contrib/atf/FREEBSD-Xlist Sun May 25 10:56:45 2014
(r266649)
+++ head/contrib/atf/FREEBSD-Xlist Sun May 25 12:01:13 2014
(r266650)
@@ -2,6 +2,8 @@
*/*/Makefile*
*/Atffile
*/Makefile*
+*/*.m4
+*/*.pc.in
Atffile
INSTALL
Makefile*
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Sun May 25 10:56:45 2014
(r266649)
+++ head/etc/mtree/BSD.tests.dist Sun May 25 12:01:13 2014
(r266650)
@@ -12,8 +12,6 @@
..
..
share
-aclocal
-..
atf
..
doc
Modified: head/lib/atf/libatf-c++/Makefile
==
--- head/lib/atf/libatf-c++/MakefileSun May 25 10:56:45 2014
(r266649)
+++ head/lib/atf/libatf-c++/MakefileSun May 25 12:01:13 2014
(r266650)
@@ -29,6 +29,7 @@
.include bsd.init.mk
LIB= atf-c++
+PRIVATELIB=true
SHLIB_MAJOR= 2
# libatf-c++ depends on the C version of the ATF library to build.
@@ -73,20 +74,6 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
MAN= atf-c++-api.3
-all: atf-c++.pc
-atf-c++.pc: atf-c++.pc.in atf-version
- sed -e 's,__CXX__,${CXX},g' \
- -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
- -e 's,__LIBDIR__,${LIBDIR},g' \
- -e s,__ATF_VERSION__,$$(cat atf-version),g \
- ${ATF}/atf-c++/atf-c++.pc.in atf-c++.pc
-
-beforeinstall:
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- atf-c++.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
- ${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
- ${ATF}/atf-c++/atf-c++.m4 ${DESTDIR}${SHAREDIR}/aclocal
-
.if ${MK_TESTS} != no
SUBDIR=tests
.endif
Modified: head/lib/atf/libatf-c++/tests/Makefile
==
--- head/lib/atf/libatf-c++/tests/Makefile Sun May 25 10:56:45 2014
(r266649)
+++ head/lib/atf/libatf-c++/tests/Makefile Sun May 25 12:01:13 2014
(r266650)
@@ -26,6 +26,4 @@ ATF_TESTS_CXX+= ${_T}
SRCS.${_T}=${_T}.cpp test_helpers.cpp
.endfor
-ATF_TESTS_SH= pkg_config_test
-
.include bsd.test.mk
Modified: head/lib/atf/libatf-c/Makefile
==
--- head/lib/atf/libatf-c/Makefile Sun May 25 10:56:45 2014
(r266649)
+++ head/lib/atf/libatf-c/Makefile Sun May 25 12:01:13 2014
(r266650)
@@ -29,6 +29,7 @@
.include bsd.init.mk
LIB= atf-c
+PRIVATELIB=true
SHLIB_MAJOR= 1
ATF= ${.CURDIR:H:H:H}/contrib/atf
@@ -75,22 +76,6 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
MAN= atf-c-api.3
-all: atf-c.pc
-atf-c.pc: atf-c.pc.in atf-version
- sed -e 's,__CC__,${CC},g' \
- -e 's,__INCLUDEDIR__,${INCLUDEDIR},g' \
- -e 's,__LIBDIR__,${LIBDIR},g' \
- -e s,__ATF_VERSION__,$$(cat atf-version),g \
- ${ATF}/atf-c/atf-c.pc.in atf-c.pc
-
-beforeinstall:
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- atf-c.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
- ${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
- ${ATF}/atf-c/atf-common.m4 ${DESTDIR}${SHAREDIR}/aclocal
- ${INSTALL} -C -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \
-
Re: svn commit: r266581 - in head: etc/mtree include lib/libcuse sys/conf sys/fs/cuse sys/modules/cuse
On Fri, May 23, 2014 at 4:46 AM, Hans Petter Selasky hsela...@freebsd.org wrote: Author: hselasky Date: Fri May 23 08:46:28 2014 New Revision: 266581 URL: http://svnweb.freebsd.org/changeset/base/266581 Modified: head/etc/mtree/BSD.include.dist == --- head/etc/mtree/BSD.include.dist Fri May 23 08:34:30 2014 (r266580) +++ head/etc/mtree/BSD.include.dist Fri May 23 08:46:28 2014 (r266581) @@ -162,6 +162,8 @@ .. .. fs + cuse + .. devfs .. fdescfs A tab sneaked in via those lines. Please fix. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r266104 - head/usr.bin/bmake
On May 14, 2014, at 21:27, Warner Losh i...@freebsd.org wrote:
Author: imp
Date: Thu May 15 01:27:24 2014
New Revision: 266104
URL: http://svnweb.freebsd.org/changeset/base/266104
Log:
Undo changes to the generated Makefile. Move tests directory to proper
location, including updating the test to work in the more-fragile
fmake - bmake bootstrap environment.
Modified:
head/usr.bin/bmake/Makefile
head/usr.bin/bmake/Makefile.inc
[...]
Modified: head/usr.bin/bmake/Makefile.inc
==
--- head/usr.bin/bmake/Makefile.inc Thu May 15 01:06:27 2014
(r266103)
+++ head/usr.bin/bmake/Makefile.inc Thu May 15 01:27:24 2014
(r266104)
@@ -13,5 +13,9 @@ PROG= make
NO_SHARED?= YES
.endif
+.if defined(MK_TESTS) ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
Ugh, and this broke the build when MK_TESTS=yes. The problem is that
tests/Makefile transparently includes ../Makefile.inc, which defines
SUBDIR+=tests (as above)... and this is obviously invalid within the tests
subdirectory.
What's your suggestion to fix this? I can think of renaming Makefile.inc to
something different to ensure that the subdirectories don't spuriously include
it.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r266074 - in head: etc/mtree usr.bin/bmake usr.bin/bmake/tests usr.bin/bmake/tests/archives usr.bin/bmake/tests/archives/fmt_44bsd usr.bin/bmake/tests/archives/fmt_44bsd_mod usr.bin/bma...
Author: jmmv Date: Wed May 14 18:43:13 2014 New Revision: 266074 URL: http://svnweb.freebsd.org/changeset/base/266074 Log: Move old fmake tests into bmake and hook them to the build. This first step is mostly to prevent the code from rotting even further and to ensure these do not get wiped when fmake's code is removed from the tree. These tests are currently being skipped because they detect the underlying make is not fmake and thus disable themselves -- and the reason is that some of the tests fail, possibly due to legitimate bugs. Enabling them to run against bmake will come separately. Lastly, it would be ideal if these tests were fed upstream but they are not ready for that yet. In the interim, just put them under usr.bin/bmake/ while we sort things out. The existence of a different unit-tests directory within here makes me feel less guilty about this. Change confirmed working with a clean amd64 build. Added: head/usr.bin/bmake/tests/ - copied from r266046, head/usr.bin/make/tests/ Deleted: head/usr.bin/make/tests/ Modified: head/etc/mtree/BSD.tests.dist head/usr.bin/bmake/Makefile head/usr.bin/bmake/tests/Makefile head/usr.bin/bmake/tests/archives/Makefile head/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile head/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile head/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile head/usr.bin/bmake/tests/basic/Makefile head/usr.bin/bmake/tests/basic/t0/Makefile head/usr.bin/bmake/tests/basic/t1/Makefile head/usr.bin/bmake/tests/basic/t2/Makefile head/usr.bin/bmake/tests/basic/t3/Makefile head/usr.bin/bmake/tests/execution/Makefile head/usr.bin/bmake/tests/execution/ellipsis/Makefile head/usr.bin/bmake/tests/execution/empty/Makefile head/usr.bin/bmake/tests/execution/joberr/Makefile head/usr.bin/bmake/tests/execution/plus/Makefile head/usr.bin/bmake/tests/shell/Makefile head/usr.bin/bmake/tests/shell/builtin/Makefile head/usr.bin/bmake/tests/shell/meta/Makefile head/usr.bin/bmake/tests/shell/path/Makefile head/usr.bin/bmake/tests/shell/path_select/Makefile head/usr.bin/bmake/tests/shell/replace/Makefile head/usr.bin/bmake/tests/shell/select/Makefile head/usr.bin/bmake/tests/suffixes/Makefile head/usr.bin/bmake/tests/suffixes/basic/Makefile head/usr.bin/bmake/tests/suffixes/src_wild1/Makefile head/usr.bin/bmake/tests/suffixes/src_wild2/Makefile head/usr.bin/bmake/tests/syntax/Makefile head/usr.bin/bmake/tests/syntax/directive-t0/Makefile head/usr.bin/bmake/tests/syntax/enl/Makefile head/usr.bin/bmake/tests/syntax/funny-targets/Makefile head/usr.bin/bmake/tests/syntax/semi/Makefile head/usr.bin/bmake/tests/sysmk/Makefile head/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile head/usr.bin/bmake/tests/sysmk/t0/2/Makefile head/usr.bin/bmake/tests/sysmk/t0/Makefile head/usr.bin/bmake/tests/sysmk/t0/mk/Makefile head/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile head/usr.bin/bmake/tests/sysmk/t1/2/Makefile head/usr.bin/bmake/tests/sysmk/t1/Makefile head/usr.bin/bmake/tests/sysmk/t1/mk/Makefile head/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile head/usr.bin/bmake/tests/sysmk/t2/2/Makefile head/usr.bin/bmake/tests/sysmk/t2/Makefile head/usr.bin/bmake/tests/sysmk/t2/mk/Makefile head/usr.bin/bmake/tests/variables/Makefile head/usr.bin/bmake/tests/variables/modifier_M/Makefile head/usr.bin/bmake/tests/variables/modifier_t/Makefile head/usr.bin/bmake/tests/variables/opt_V/Makefile head/usr.bin/bmake/tests/variables/t0/Makefile head/usr.bin/make/Makefile Modified: head/etc/mtree/BSD.tests.dist == --- head/etc/mtree/BSD.tests.dist Wed May 14 18:41:59 2014 (r266073) +++ head/etc/mtree/BSD.tests.dist Wed May 14 18:43:13 2014 (r266074) @@ -133,21 +133,7 @@ atf-sh .. .. -calendar -.. -comm -.. -file2c -.. -join -.. -jot -.. -lastcomm -.. -m4 -.. -make +bmake archives fmt_44bsd .. @@ -245,6 +231,20 @@ .. .. .. +calendar +.. +comm +.. +file2c +.. +join +.. +jot +.. +lastcomm +.. +m4 +.. ncal .. printf Modified: head/usr.bin/bmake/Makefile == --- head/usr.bin/bmake/Makefile Wed May 14 18:41:59 2014(r266073) +++ head/usr.bin/bmake/Makefile Wed May 14 18:43:13 2014(r266074) @@ -3,6 +3,7 @@ # # $FreeBSD$
svn commit: r265933 - head/tools/build/mk
Author: jmmv
Date: Mon May 12 21:21:32 2014
New Revision: 265933
URL: http://svnweb.freebsd.org/changeset/base/265933
Log:
Fix delete-old when WITH_TESTS is set.
r265423 removed the WITHOUT_BMAKE option, which in turn broke a conditional
in OptionalObsoleteFiles.inc that inspected MK_BMAKE.
Modified:
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon May 12 20:48:04
2014(r265932)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon May 12 21:21:32
2014(r265933)
@@ -4129,7 +4129,7 @@ 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
-.if ${MK_MAKE} == yes ${MK_BMAKE} == yes
+.if ${MK_MAKE} == yes
OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r265037 - in stable/10: cddl cddl/lib cddl/lib/tests cddl/sbin cddl/sbin/tests cddl/tests cddl/usr.bin cddl/usr.bin/tests cddl/usr.sbin cddl/usr.sbin/tests etc etc/mtree etc/tests games...
Author: jmmv
Date: Mon Apr 28 04:20:14 2014
New Revision: 265037
URL: http://svnweb.freebsd.org/changeset/base/265037
Log:
MFC r264741: Add placeholder Kyuafiles for various top-level hierarchies.
This is make tinderbox clean.
Added:
stable/10/cddl/lib/tests/
- copied from r264741, head/cddl/lib/tests/
stable/10/cddl/sbin/tests/
- copied from r264741, head/cddl/sbin/tests/
stable/10/cddl/tests/
- copied from r264741, head/cddl/tests/
stable/10/cddl/usr.bin/tests/
- copied from r264741, head/cddl/usr.bin/tests/
stable/10/cddl/usr.sbin/tests/
- copied from r264741, head/cddl/usr.sbin/tests/
stable/10/etc/tests/
- copied from r264741, head/etc/tests/
stable/10/games/tests/
- copied from r264741, head/games/tests/
stable/10/gnu/lib/tests/
- copied from r264741, head/gnu/lib/tests/
stable/10/gnu/tests/
- copied from r264741, head/gnu/tests/
stable/10/gnu/usr.bin/tests/
- copied from r264741, head/gnu/usr.bin/tests/
stable/10/secure/lib/tests/
- copied from r264741, head/secure/lib/tests/
stable/10/secure/libexec/tests/
- copied from r264741, head/secure/libexec/tests/
stable/10/secure/tests/
- copied from r264741, head/secure/tests/
stable/10/secure/usr.bin/tests/
- copied from r264741, head/secure/usr.bin/tests/
stable/10/secure/usr.sbin/tests/
- copied from r264741, head/secure/usr.sbin/tests/
Modified:
stable/10/cddl/Makefile
stable/10/cddl/lib/Makefile
stable/10/cddl/sbin/Makefile
stable/10/cddl/usr.bin/Makefile
stable/10/cddl/usr.sbin/Makefile
stable/10/etc/Makefile
stable/10/etc/mtree/BSD.tests.dist
stable/10/games/Makefile
stable/10/gnu/Makefile
stable/10/gnu/lib/Makefile
stable/10/gnu/usr.bin/Makefile
stable/10/secure/Makefile
stable/10/secure/lib/Makefile
stable/10/secure/libexec/Makefile
stable/10/secure/usr.bin/Makefile
stable/10/secure/usr.sbin/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/Makefile
==
--- stable/10/cddl/Makefile Mon Apr 28 02:35:28 2014(r265036)
+++ stable/10/cddl/Makefile Mon Apr 28 04:20:14 2014(r265037)
@@ -1,5 +1,11 @@
# $FreeBSD$
+.include bsd.own.mk
+
SUBDIR=lib sbin usr.bin usr.sbin
+.if ${MK_TESTS} != no
+SUBDIR+=tests
+.endif
+
.include bsd.subdir.mk
Modified: stable/10/cddl/lib/Makefile
==
--- stable/10/cddl/lib/Makefile Mon Apr 28 02:35:28 2014(r265036)
+++ stable/10/cddl/lib/Makefile Mon Apr 28 04:20:14 2014(r265037)
@@ -11,7 +11,12 @@ SUBDIR= ${_drti} \
libuutil \
${_libzfs_core} \
${_libzfs} \
- ${_libzpool}
+ ${_libzpool} \
+ ${_tests}
+
+.if ${MK_TESTS} != no
+_tests=tests
+.endif
.if ${MK_ZFS} != no
_libzfs_core= libzfs_core
Modified: stable/10/cddl/sbin/Makefile
==
--- stable/10/cddl/sbin/MakefileMon Apr 28 02:35:28 2014
(r265036)
+++ stable/10/cddl/sbin/MakefileMon Apr 28 04:20:14 2014
(r265037)
@@ -2,7 +2,11 @@
.include bsd.own.mk
-SUBDIR=${_zfs} ${_zpool}
+SUBDIR=${_tests} ${_zfs} ${_zpool}
+
+.if ${MK_TESTS} != no
+_tests=tests
+.endif
.if ${MK_ZFS} != no
_zfs= zfs
Modified: stable/10/cddl/usr.bin/Makefile
==
--- stable/10/cddl/usr.bin/Makefile Mon Apr 28 02:35:28 2014
(r265036)
+++ stable/10/cddl/usr.bin/Makefile Mon Apr 28 04:20:14 2014
(r265037)
@@ -7,11 +7,16 @@ SUBDIR= \
ctfdump \
ctfmerge \
sgsmsg \
+ ${_tests} \
${_zinject} \
${_zlook} \
${_zstreamdump} \
${_ztest}
+.if ${MK_TESTS} != no
+_tests=tests
+.endif
+
.if ${MK_ZFS} != no
_zinject= zinject
#_zlook= zlook
Modified: stable/10/cddl/usr.sbin/Makefile
==
--- stable/10/cddl/usr.sbin/MakefileMon Apr 28 02:35:28 2014
(r265036)
+++ stable/10/cddl/usr.sbin/MakefileMon Apr 28 04:20:14 2014
(r265037)
@@ -5,9 +5,14 @@
SUBDIR=${_dtrace} \
${_dtruss} \
${_lockstat} \
+ ${_tests} \
${_zdb} \
${_zhack}
+.if ${MK_TESTS} != no
+_tests=tests
+.endif
+
.if ${MK_ZFS} != no
.if ${MK_LIBTHR} != no
_zdb= zdb
Modified: stable/10/etc/Makefile
==
--- stable/10/etc/Makefile Mon Apr 28 02:35:28 2014(r265036)
+++ stable/10/etc/Makefile Mon Apr 28 04:20:14 2014(r265037)
@@ -7,6 +7,10 @@
SUBDIR=sendmail
.endif
+.if ${MK_TESTS} != no
+SUBDIR+=tests
+.endif
+
BIN1= crontab \
svn commit: r264996 - in stable/10: . bin/pkill bin/pkill/tests etc/mtree sbin sbin/dhclient sbin/dhclient/tests sbin/growfs sbin/growfs/tests sbin/mdconfig sbin/mdconfig/tests sbin/tests tools/bui...
Author: jmmv
Date: Sun Apr 27 01:15:10 2014
New Revision: 264996
URL: http://svnweb.freebsd.org/changeset/base/264996
Log:
MFC various moves of tools/regressions/ tests to the new infrastructure.
- r263220 Migrate tools/regression/sbin/ to the new tests layout.
- r263222 Add Makefile missed in r263220.
- r263226 Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new
tests layout.
- r263227 Migrate most of tools/regression/usr.bin/ to the new tests layout.
- r263345 Expand tabs that sneaked in into spaces.
- r263346 Migrate tools/regression/usr.bin/make/ to the new tests layout.
- r263348 Add Makefiles missed in r263346.
- r263351 Migrate tools/regression/usr.bin/pkill/ to the new tests layout.
- r263388 Mark multi_test as requiring /usr/share/dict/words.
- r263814 Fix path to the run.pl script to let these tests run.
- r264742 Prevent building tests when bootstrapping make.
This is 'make tinderbox' clean.
Added:
stable/10/bin/pkill/tests/
- copied from r263351, head/bin/pkill/tests/
stable/10/sbin/dhclient/tests/
- copied from r263220, head/sbin/dhclient/tests/
stable/10/sbin/growfs/tests/
- copied from r263220, head/sbin/growfs/tests/
stable/10/sbin/mdconfig/tests/
- copied from r263220, head/sbin/mdconfig/tests/
stable/10/sbin/mdconfig/tests/Makefile
- copied unchanged from r263222, head/sbin/mdconfig/tests/Makefile
stable/10/sbin/tests/
- copied from r263220, head/sbin/tests/
stable/10/usr.bin/apply/tests/
- copied from r263227, head/usr.bin/apply/tests/
stable/10/usr.bin/calendar/tests/
- copied from r263227, head/usr.bin/calendar/tests/
stable/10/usr.bin/comm/tests/
- copied from r263227, head/usr.bin/comm/tests/
stable/10/usr.bin/file2c/tests/
- copied from r263227, head/usr.bin/file2c/tests/
stable/10/usr.bin/join/tests/
- copied from r263227, head/usr.bin/join/tests/
stable/10/usr.bin/jot/tests/
- copied from r263227, head/usr.bin/jot/tests/
stable/10/usr.bin/lastcomm/tests/
- copied from r263226, head/usr.bin/lastcomm/tests/
stable/10/usr.bin/m4/tests/
- copied from r263227, head/usr.bin/m4/tests/
stable/10/usr.bin/make/tests/
- copied from r263346, head/usr.bin/make/tests/
stable/10/usr.bin/make/tests/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/Makefile
stable/10/usr.bin/make/tests/archives/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/archives/Makefile
stable/10/usr.bin/make/tests/archives/fmt_44bsd/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/archives/fmt_44bsd/Makefile
stable/10/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
stable/10/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
stable/10/usr.bin/make/tests/basic/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/basic/Makefile
stable/10/usr.bin/make/tests/basic/t0/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/basic/t0/Makefile
stable/10/usr.bin/make/tests/basic/t1/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/basic/t1/Makefile
stable/10/usr.bin/make/tests/basic/t2/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/basic/t2/Makefile
stable/10/usr.bin/make/tests/basic/t3/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/basic/t3/Makefile
stable/10/usr.bin/make/tests/execution/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/execution/Makefile
stable/10/usr.bin/make/tests/execution/ellipsis/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/execution/ellipsis/Makefile
stable/10/usr.bin/make/tests/execution/empty/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/execution/empty/Makefile
stable/10/usr.bin/make/tests/execution/joberr/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/execution/joberr/Makefile
stable/10/usr.bin/make/tests/execution/plus/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/execution/plus/Makefile
stable/10/usr.bin/make/tests/shell/Makefile
- copied unchanged from r263348, head/usr.bin/make/tests/shell/Makefile
stable/10/usr.bin/make/tests/shell/builtin/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/shell/builtin/Makefile
stable/10/usr.bin/make/tests/shell/meta/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/shell/meta/Makefile
stable/10/usr.bin/make/tests/shell/path/Makefile
- copied unchanged from r263348,
head/usr.bin/make/tests/shell/path/Makefile
stable/10/usr.bin/make/tests/shell/path_select/Makefile
- copied unchanged from r263348,
svn commit: r264741 - in head: cddl cddl/lib cddl/lib/tests cddl/sbin cddl/sbin/tests cddl/tests cddl/usr.bin cddl/usr.bin/tests cddl/usr.sbin cddl/usr.sbin/tests etc etc/mtree etc/tests games game...
Author: jmmv
Date: Mon Apr 21 21:39:25 2014
New Revision: 264741
URL: http://svnweb.freebsd.org/changeset/base/264741
Log:
Add placeholder Kyuafiles for various top-level hierarchies.
This change adds tests/ directories in the source tree to create various
subdirectories in /usr/tests/ and to install placeholder Kyuafiles for
them.
the relevant hierarchies are: cddl, etc, games, gnu and secure.
The reason for this is to simplify the addition of new test programs for
utilities or libraries under any of these directories. Doing so on a
case by case basis is unnecessary and is quite an obscure process.
Added:
head/cddl/lib/tests/
head/cddl/lib/tests/Makefile (contents, props changed)
head/cddl/sbin/tests/
head/cddl/sbin/tests/Makefile (contents, props changed)
head/cddl/tests/
head/cddl/tests/Makefile (contents, props changed)
head/cddl/usr.bin/tests/
head/cddl/usr.bin/tests/Makefile (contents, props changed)
head/cddl/usr.sbin/tests/
head/cddl/usr.sbin/tests/Makefile (contents, props changed)
head/etc/tests/
head/etc/tests/Makefile (contents, props changed)
head/games/tests/
head/games/tests/Makefile (contents, props changed)
head/gnu/lib/tests/
head/gnu/lib/tests/Makefile (contents, props changed)
head/gnu/tests/
head/gnu/tests/Makefile (contents, props changed)
head/gnu/usr.bin/tests/
head/gnu/usr.bin/tests/Makefile (contents, props changed)
head/secure/lib/tests/
head/secure/lib/tests/Makefile (contents, props changed)
head/secure/libexec/tests/
head/secure/libexec/tests/Makefile (contents, props changed)
head/secure/tests/
head/secure/tests/Makefile (contents, props changed)
head/secure/usr.bin/tests/
head/secure/usr.bin/tests/Makefile (contents, props changed)
head/secure/usr.sbin/tests/
head/secure/usr.sbin/tests/Makefile (contents, props changed)
Modified:
head/cddl/Makefile
head/cddl/lib/Makefile
head/cddl/sbin/Makefile
head/cddl/usr.bin/Makefile
head/cddl/usr.sbin/Makefile
head/etc/Makefile
head/etc/mtree/BSD.tests.dist
head/games/Makefile
head/gnu/Makefile
head/gnu/lib/Makefile
head/gnu/usr.bin/Makefile
head/secure/Makefile
head/secure/lib/Makefile
head/secure/libexec/Makefile
head/secure/usr.bin/Makefile
head/secure/usr.sbin/Makefile
Modified: head/cddl/Makefile
==
--- head/cddl/Makefile Mon Apr 21 19:33:27 2014(r264740)
+++ head/cddl/Makefile Mon Apr 21 21:39:25 2014(r264741)
@@ -1,5 +1,11 @@
# $FreeBSD$
+.include bsd.own.mk
+
SUBDIR=lib sbin usr.bin usr.sbin
+.if ${MK_TESTS} != no
+SUBDIR+=tests
+.endif
+
.include bsd.subdir.mk
Modified: head/cddl/lib/Makefile
==
--- head/cddl/lib/Makefile Mon Apr 21 19:33:27 2014(r264740)
+++ head/cddl/lib/Makefile Mon Apr 21 21:39:25 2014(r264741)
@@ -11,7 +11,12 @@ SUBDIR= ${_drti} \
libuutil \
${_libzfs_core} \
${_libzfs} \
- ${_libzpool}
+ ${_libzpool} \
+ ${_tests}
+
+.if ${MK_TESTS} != no
+_tests=tests
+.endif
.if ${MK_ZFS} != no
_libzfs_core= libzfs_core
Added: head/cddl/lib/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/lib/tests/MakefileMon Apr 21 21:39:25 2014
(r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/cddl/lib
+
+.PATH: ${.CURDIR:H:H:H}/tests
+KYUAFILE= yes
+
+.include bsd.test.mk
Modified: head/cddl/sbin/Makefile
==
--- head/cddl/sbin/Makefile Mon Apr 21 19:33:27 2014(r264740)
+++ head/cddl/sbin/Makefile Mon Apr 21 21:39:25 2014(r264741)
@@ -2,7 +2,11 @@
.include bsd.own.mk
-SUBDIR=${_zfs} ${_zpool}
+SUBDIR=${_tests} ${_zfs} ${_zpool}
+
+.if ${MK_TESTS} != no
+_tests=tests
+.endif
.if ${MK_ZFS} != no
_zfs= zfs
Added: head/cddl/sbin/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/sbin/tests/Makefile Mon Apr 21 21:39:25 2014
(r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/cddl/sbin
+
+.PATH: ${.CURDIR:H:H:H}/tests
+KYUAFILE= yes
+
+.include bsd.test.mk
Added: head/cddl/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/cddl/tests/MakefileMon Apr 21 21:39:25 2014(r264741)
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/cddl
svn commit: r264742 - head
Author: jmmv
Date: Mon Apr 21 22:36:31 2014
New Revision: 264742
URL: http://svnweb.freebsd.org/changeset/base/264742
Log:
Prevent building tests when bootstrapping make.
Should fix the breakage reported by tinderbox when WITHOUT_BMAKE is set,
which was probably introduced in r263346..
Modified:
head/Makefile
Modified: head/Makefile
==
--- head/Makefile Mon Apr 21 21:39:25 2014(r264741)
+++ head/Makefile Mon Apr 21 22:36:31 2014(r264742)
@@ -330,7 +330,8 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
INSTALL=sh ${.CURDIR}/tools/install.sh
MMAKE= ${MMAKEENV} ${MAKE} \
-D_UPGRADING -DNO_MAN -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T}
+ -DNO_CPU_CFLAGS -DNO_WERROR \
+ DESTDIR= MK_TESTS=no PROGNAME=${MYMAKE:T}
make bmake: .PHONY
@echo
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263346 - in head: etc/mtree tools/build/mk tools/regression/usr.bin/make usr.bin/make usr.bin/make/tests usr.bin/make/tests/archives/fmt_44bsd usr.bin/make/tests/archives/fmt_44bsd_mo
On Fri, Mar 28, 2014 at 1:32 AM, Julio Merino j...@freebsd.org wrote: On Wed, Mar 26, 2014 at 12:25 AM, Dag-Erling Smørgrav d...@des.no wrote: Julio Merino j...@freebsd.org writes: Log: Migrate tools/regression/usr.bin/make/ to the new tests layout. Note that these tests are for fmake, not bmake, and thus they are not installed nor run when bmake is selected (the default). Yes, I have wasted a *ton* of time on moving tests for no real reason other than ensuring they are not left behind. But maybe, just maybe, it was not work in vain: the majority of these tests also work with bmake and the few that don't may point at broken stuff. For example, the tests for the archive feature do not work with bmake, but bmake's manpage and source tree seem to imply that they should. So... to be investigated later; need to poke sjg@. This, or a subsequent but related commit, broke the WITHOUT_BMAKE build: Apologies for not having gotten to this yet. Will try to deal with it during the weekend or next week when I'm back home. (Still traveling after AsiaBSDCon and been focusing on fixing some other issues in the testing cluster.) Finally got to this. Just committed r264742 which will hopefully fix it. In the meantime: could someone enlighten me as to why !bmake is still supported? Question still stands. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r264592 - stable/10/lib/libc/net
Author: jmmv
Date: Thu Apr 17 11:49:19 2014
New Revision: 264592
URL: http://svnweb.freebsd.org/changeset/base/264592
Log:
MFC r263090: Make ether_line really report an error when all input is invalid.
Modified:
stable/10/lib/libc/net/ether_addr.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/net/ether_addr.c
==
--- stable/10/lib/libc/net/ether_addr.c Thu Apr 17 11:48:34 2014
(r264591)
+++ stable/10/lib/libc/net/ether_addr.c Thu Apr 17 11:49:19 2014
(r264592)
@@ -72,11 +72,13 @@ ether_line(const char *l, struct ether_a
i = sscanf(l, %x:%x:%x:%x:%x:%x %s, o[0], o[1], o[2], o[3],
o[4], o[5], hostname);
- if (i != 7)
- return (i);
- for (i=0; i6; i++)
- e-octet[i] = o[i];
- return (0);
+ if (i == 7) {
+ for (i = 0; i 6; i++)
+ e-octet[i] = o[i];
+ return (0);
+ } else {
+ return (-1);
+ }
}
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r264606 - stable/10/share/man/man5
Author: jmmv Date: Thu Apr 17 13:10:30 2014 New Revision: 264606 URL: http://svnweb.freebsd.org/changeset/base/264606 Log: Regen src.conf.5. Notional merge of r264409 which regenerated this manpage after the rewording of WITH_TESTS. Modified: stable/10/share/man/man5/src.conf.5 Modified: stable/10/share/man/man5/src.conf.5 == --- stable/10/share/man/man5/src.conf.5 Thu Apr 17 13:02:59 2014 (r264605) +++ stable/10/share/man/man5/src.conf.5 Thu Apr 17 13:10:30 2014 (r264606) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. -.\ from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des +.\ from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\ $FreeBSD$ -.Dd March 1, 2014 +.Dd April 14, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -78,54 +78,54 @@ The following list provides a name and s that can be used for source builds. .Bl -tag -width indent .It Va WITHOUT_ACCT -.\ from FreeBSD: head/tools/build/options/WITHOUT_ACCT 223201 2011-06-17 20:47:44Z ed +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_ACCT 223201 2011-06-17 20:47:44Z ed Set to not build process accounting tools such as .Xr accton 8 and .Xr sa 8 . .It Va WITHOUT_ACPI -.\ from FreeBSD: head/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru Set to not build .Xr acpiconf 8 , .Xr acpidump 8 and related programs. .It Va WITHOUT_AMD -.\ from FreeBSD: head/tools/build/options/WITHOUT_AMD 183242 2008-09-21 22:02:26Z sam +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_AMD 183242 2008-09-21 22:02:26Z sam Set to not build .Xr amd 8 , and related programs. .It Va WITHOUT_APM -.\ from FreeBSD: head/tools/build/options/WITHOUT_APM 183242 2008-09-21 22:02:26Z sam +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_APM 183242 2008-09-21 22:02:26Z sam Set to not build .Xr apm 8 , .Xr apmd 8 and related programs. .It Va WITHOUT_ARM_EABI -.\ from FreeBSD: head/tools/build/options/WITHOUT_ARM_EABI 253396 2013-07-16 19:15:19Z andrew +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_ARM_EABI 253396 2013-07-16 19:15:19Z andrew Set the ARM ABI to OABI. .It Va WITHOUT_ASSERT_DEBUG -.\ from FreeBSD: head/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru Set to compile programs and libraries without the .Xr assert 3 checks. .It Va WITHOUT_AT -.\ from FreeBSD: head/tools/build/options/WITHOUT_AT 183242 2008-09-21 22:02:26Z sam +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_AT 183242 2008-09-21 22:02:26Z sam Set to not build .Xr at 1 and related utilities. .It Va WITHOUT_ATM -.\ from FreeBSD: head/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru Set to not build programs and libraries related to ATM networking. .It Va WITHOUT_AUDIT -.\ from FreeBSD: head/tools/build/options/WITHOUT_AUDIT 156932 2006-03-21 07:50:50Z ru +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_AUDIT 156932 2006-03-21 07:50:50Z ru Set to not build audit support into system programs. .It Va WITHOUT_AUTHPF -.\ from FreeBSD: head/tools/build/options/WITHOUT_AUTHPF 156932 2006-03-21 07:50:50Z ru +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_AUTHPF 156932 2006-03-21 07:50:50Z ru Set to not build .Xr authpf 8 . .It Va WITHOUT_BINUTILS -.\ from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 255974 2013-10-01 17:40:56Z emaste +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_BINUTILS 255974 2013-10-01 17:40:56Z emaste Set to not install binutils (as, c++-filt, gconv, ld, nm, objcopy, objdump, readelf, size and strip). .Bf -symbolic @@ -133,34 +133,34 @@ The option does not generally work for b toolchain is enabled. .Ef .It Va WITHOUT_BLUETOOTH -.\ from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru Set to not build Bluetooth related kernel modules, programs and libraries. .It Va WITHOUT_BMAKE -.\ from FreeBSD: head/tools/build/options/WITHOUT_BMAKE 250839 2013-05-21 00:41:49Z delphij +.\ from FreeBSD: stable/10/tools/build/options/WITHOUT_BMAKE 264572 2014-04-16 23:12:35Z jmmv Set to not build and install the portable BSD make (bmake) as .Xr make 1 instead of the traditional FreeBSD make. This build option is temporary. -It allows developers to switch to bmake in order to work out any remaining -kinks or issues. +It allows developers to switch to the traditional FreeBSD make in order to +work out any remaining kinks or issues. This option
svn commit: r264607 - stable/10/tests/sys/kern
Author: jmmv
Date: Thu Apr 17 13:11:56 2014
New Revision: 264607
URL: http://svnweb.freebsd.org/changeset/base/264607
Log:
MFC r264133: Fix variable type to avoid printf formatter warning.
Modified:
stable/10/tests/sys/kern/unix_seqpacket_test.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/tests/sys/kern/unix_seqpacket_test.c
==
--- stable/10/tests/sys/kern/unix_seqpacket_test.c Thu Apr 17 13:10:30
2014(r264606)
+++ stable/10/tests/sys/kern/unix_seqpacket_test.c Thu Apr 17 13:11:56
2014(r264607)
@@ -872,7 +872,7 @@ ATF_TC_BODY(rcvbuf_oversized, tc)
{
int i;
int sv[2];
- const int pktsize = 1024;
+ const ssize_t pktsize = 1024;
const size_t sndbufsize = 8192;
const size_t rcvbufsize = 131072;
const size_t geometric_mean_bufsize = 32768;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r264618 - in stable/10: contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-sh etc/mtree lib/atf/libatf-c lib/atf/libatf-c++ usr.bin/atf/atf-sh
Author: jmmv
Date: Thu Apr 17 17:20:56 2014
New Revision: 264618
URL: http://svnweb.freebsd.org/changeset/base/264618
Log:
MFC r263989: Add atf m4 files from the vendor branch.
Added:
stable/10/contrib/atf/atf-c++/atf-c++.m4
- copied unchanged from r263989, head/contrib/atf/atf-c++/atf-c++.m4
stable/10/contrib/atf/atf-c/atf-c.m4
- copied unchanged from r263989, head/contrib/atf/atf-c/atf-c.m4
stable/10/contrib/atf/atf-c/atf-common.m4
- copied unchanged from r263989, head/contrib/atf/atf-c/atf-common.m4
stable/10/contrib/atf/atf-sh/atf-sh.m4
- copied unchanged from r263989, head/contrib/atf/atf-sh/atf-sh.m4
Modified:
stable/10/contrib/atf/FREEBSD-Xlist
stable/10/etc/mtree/BSD.tests.dist
stable/10/lib/atf/libatf-c++/Makefile
stable/10/lib/atf/libatf-c/Makefile
stable/10/usr.bin/atf/atf-sh/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/atf/FREEBSD-Xlist
==
--- stable/10/contrib/atf/FREEBSD-Xlist Thu Apr 17 16:00:26 2014
(r264617)
+++ stable/10/contrib/atf/FREEBSD-Xlist Thu Apr 17 17:20:56 2014
(r264618)
@@ -7,7 +7,6 @@ INSTALL
Makefile*
aclocal.m4
admin/
-atf-*/atf-*.m4
atf-config/
atf-report/
atf-run/
Copied: stable/10/contrib/atf/atf-c++/atf-c++.m4 (from r263989,
head/contrib/atf/atf-c++/atf-c++.m4)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/contrib/atf/atf-c++/atf-c++.m4Thu Apr 17 17:20:56 2014
(r264618, copy of r263989, head/contrib/atf/atf-c++/atf-c++.m4)
@@ -0,0 +1,48 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl * Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in the
+dnl documentation and/or other materials provided with the distribution.
+dnl * Neither the name of Google Inc. nor the names of its contributors
+dnl may be used to endorse or promote products derived from this software
+dnl without specific prior written permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+dnl AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+
+dnl ATF_CHECK_CXX([version-spec])
+dnl
+dnl Checks if atf-c++ is present. If version-spec is provided, ensures that
+dnl the installed version of atf-sh matches the required version. This
+dnl argument must be something like '= 0.14' and accepts any version
+dnl specification supported by pkg-config.
+dnl
+dnl Defines and substitutes ATF_CXX_CFLAGS and ATF_CXX_LIBS with the compiler
+dnl and linker flags need to build against atf-c++.
+AC_DEFUN([ATF_CHECK_CXX], [
+spec=atf-c++[]m4_default_nblank([ $1], [])
+_ATF_CHECK_ARG_WITH(
+[PKG_CHECK_MODULES([ATF_CXX], [${spec}],
+ [found=yes found_atf_cxx=yes], [found=no])],
+[required ${spec} not found])
+])
Copied: stable/10/contrib/atf/atf-c/atf-c.m4 (from r263989,
head/contrib/atf/atf-c/atf-c.m4)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/contrib/atf/atf-c/atf-c.m4Thu Apr 17 17:20:56 2014
(r264618, copy of r263989, head/contrib/atf/atf-c/atf-c.m4)
@@ -0,0 +1,48 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl * Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of
svn commit: r264572 - in stable/10: gnu/usr.bin/groff/tmac share/man/man7 tools/build/options
Author: jmmv
Date: Wed Apr 16 23:12:35 2014
New Revision: 264572
URL: http://svnweb.freebsd.org/changeset/base/264572
Log:
MFC several WITH_TESTS-related documentation fixes.
- r258014 Document WITH_TESTS src.conf(5) option.
- r263089 Fix description of WITHOUT_BMAKE's purpose.
- r264408 Fix test suite name in src.conf(5).
- r264410 Document how to install the test suite.
- r264412 Add FreeBSD 10.1 to the list of recognized releases for Fx.
- r264413 Miscellaneous fixes to tests(7).
Added:
stable/10/tools/build/options/WITH_TESTS
- copied, changed from r258014, head/tools/build/options/WITH_TESTS
Modified:
stable/10/gnu/usr.bin/groff/tmac/mdoc.local
stable/10/share/man/man7/Makefile
stable/10/share/man/man7/tests.7
stable/10/tools/build/options/WITHOUT_BMAKE
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/gnu/usr.bin/groff/tmac/mdoc.local
==
--- stable/10/gnu/usr.bin/groff/tmac/mdoc.local Wed Apr 16 22:26:42 2014
(r264571)
+++ stable/10/gnu/usr.bin/groff/tmac/mdoc.local Wed Apr 16 23:12:35 2014
(r264572)
@@ -58,6 +58,7 @@
.ds doc-operating-system-FreeBSD-9.19.1
.ds doc-operating-system-FreeBSD-9.29.2
.ds doc-operating-system-FreeBSD-10.0 10.0
+.ds doc-operating-system-FreeBSD-10.1 10.1
.ds doc-operating-system-NetBSD-7.0 7.0
.
.\ Definitions not (yet) in doc-syms
Modified: stable/10/share/man/man7/Makefile
==
--- stable/10/share/man/man7/Makefile Wed Apr 16 22:26:42 2014
(r264571)
+++ stable/10/share/man/man7/Makefile Wed Apr 16 23:12:35 2014
(r264572)
@@ -27,12 +27,9 @@ MAN= adding_user.7 \
sprog.7 \
stdint.7 \
sticky.7 \
+ tests.7 \
tuning.7
-.if ${MK_TESTS} != no
-MAN+= tests.7
-.endif
-
MLINKS=intro.7 miscellaneous.7
MLINKS+= security.7 securelevel.7
MLINKS+= c99.7 c.7
Modified: stable/10/share/man/man7/tests.7
==
--- stable/10/share/man/man7/tests.7Wed Apr 16 22:26:42 2014
(r264571)
+++ stable/10/share/man/man7/tests.7Wed Apr 16 23:12:35 2014
(r264572)
@@ -26,16 +26,16 @@
.\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd March 20, 2014
+.Dd April 13, 2014
.Dt TESTS 7
.Os
.Sh NAME
.Nm tests
-.Nd introduction to the FreeBSD test suite
+.Nd introduction to the FreeBSD Test Suite
.Sh DESCRIPTION
The
.Fx
-test suite provides a collection of automated tests for two major purposes.
+Test Suite provides a collection of automated tests for two major purposes.
On one hand, the test suite aids
.Em developers
to detect bugs and regressions when they modify the source tree. On the other
@@ -50,12 +50,31 @@ maintenance.
.Pp
The
.Fx
-test suite is installed in the
+Test Suite can be found in the
.Pa /usr/tests
hierarchy.
.Pp
This manual page describes how to run the test suite and how to configure
some of its optional features.
+.Ss Installing the test suite
+The test suite is not yet installed by default as part of
+.Fx ,
+but this is bound to change during the development of
+.Fx 11.0 .
+.Pp
+If the
+.Pa /usr/tests
+directory is missing, then you will have to enable the build of the test
+suite, rebuild your system and install the results.
+You can do so by setting
+.Sq WITH_TESTS=yes
+in your
+.Pa /etc/src.conf
+file (see
+.Xr src.conf 5
+for details)
+and rebuilding the system as described in
+.Xr build 7 .
.Ss When to run the tests?
Before diving into the details of how to run the test suite, here are some
scenarios in which you should run it:
@@ -129,7 +148,7 @@ to its manual page
.Ss Configuring the tests
Some test cases in the
.Fx
-test suite require manual configuration by the administrator before they can be
+Test Suite require manual configuration by the administrator before they can be
run. Unless certain properties are defined, the tests that require them will
be skipped.
.Pp
@@ -141,7 +160,7 @@ The format of this file is detailed in
.Pp
The following configuration variables are available in the
.Fx
-test suite:
+Test Suite:
.Bl -tag -width allow_sysctl_side_effects
.It allow_devfs_side_effects
If defined, enables tests that may destroy and recreate semipermanent device
@@ -192,21 +211,24 @@ Default result database used by Kyua.
.It Pa /usr/tests/
Location of the
.Fx
-test suite.
+Test Suite.
.It Pa /usr/tests/Kyuafile
Top-level test suite definition file.
.El
.Sh SEE ALSO
-.Xr kyua 1 .
+.Xr kyua 1 ,
+.Xr build 7
.Sh HISTORY
-This test suite first appeared in
-.Fx 11.0 .
+The
+.Fx
+Test Suite first appeared in
+.Fx 10.1 .
.Pp
The
.Nm
manual page first appeared in
.Nx 6.0
and was later ported to
-.Fx 11.0 .
+.Fx 10.1 .
.Sh AUTHORS
-.An Julio Merino Aq Mt j
svn commit: r264457 - in stable/10: sys/net tools/regression/lib/libc/net tools/regression/lib/libc/string tools/regression/priv tools/regression/sbin/mdconfig tools/regression/usr.bin/lastcomm too...
Author: jmmv Date: Mon Apr 14 13:30:08 2014 New Revision: 264457 URL: http://svnweb.freebsd.org/changeset/base/264457 Log: MFC various fixes to the tools/regression/ tests. - r262953 Fix m4 tests so that they run cleanly with prove. - r262954 Fix printf tests so that they run cleanly with prove. - r262959 Fix sed tests so that they run cleanly with prove. - r262960 Fix yacc tests so that they run cleanly with prove. - r262961 Fix pkill tests so that they run cleanly with prove. - r262962 Fix ncal tests so that they run cleanly with prove. - r263081 Fix lastcomm tests under amd64. - r263082 Only run the make tests when make is fmake. - r263083 Fix sa tests. - r263084 Turn a test precondition into a skip in the mdconfig tests. - r263085 Make the strerror tests work without libtap. - r263087 Remove broken tests for eui64_line. - r263221 Change etcupdate tests to return 1 on test failures. - r263352 Make the priv test program exit with non-zero if any failures are detected. - r263353 errx prepends the program name to the message; don't do it by hand. - r263362 Include strings.h so that bpf_filter.c can be built in userland. Deleted: stable/10/tools/regression/lib/libc/net/test-eui64_line.c stable/10/tools/regression/lib/libc/net/test-eui64_line.t Modified: stable/10/sys/net/bpf_filter.c stable/10/tools/regression/lib/libc/net/Makefile stable/10/tools/regression/lib/libc/string/Makefile stable/10/tools/regression/lib/libc/string/test-strerror.c stable/10/tools/regression/priv/main.c stable/10/tools/regression/sbin/mdconfig/00.t stable/10/tools/regression/usr.bin/lastcomm/regress.t stable/10/tools/regression/usr.bin/lastcomm/v1-amd64.out stable/10/tools/regression/usr.bin/lastcomm/v2-amd64.out stable/10/tools/regression/usr.bin/m4/regress.gnusofterror.out stable/10/tools/regression/usr.bin/m4/regress.sh stable/10/tools/regression/usr.bin/m4/regress.t stable/10/tools/regression/usr.bin/make/common.sh stable/10/tools/regression/usr.bin/ncal/regress.sh stable/10/tools/regression/usr.bin/pkill/pgrep-_s.t stable/10/tools/regression/usr.bin/printf/regress.sh stable/10/tools/regression/usr.bin/sed/regress.sh stable/10/tools/regression/usr.bin/yacc/regress.00.out stable/10/tools/regression/usr.bin/yacc/regress.01.out stable/10/tools/regression/usr.bin/yacc/regress.02.out stable/10/tools/regression/usr.bin/yacc/regress.03.out stable/10/tools/regression/usr.bin/yacc/regress.04.out stable/10/tools/regression/usr.bin/yacc/regress.05.out stable/10/tools/regression/usr.bin/yacc/regress.06.out stable/10/tools/regression/usr.bin/yacc/regress.07.out stable/10/tools/regression/usr.bin/yacc/regress.08.out stable/10/tools/regression/usr.bin/yacc/regress.09.out stable/10/tools/regression/usr.bin/yacc/regress.10.out stable/10/tools/regression/usr.bin/yacc/regress.11.out stable/10/tools/regression/usr.bin/yacc/regress.12.out stable/10/tools/regression/usr.bin/yacc/regress.13.out stable/10/tools/regression/usr.bin/yacc/regress.14.out stable/10/tools/regression/usr.bin/yacc/regress.sh stable/10/tools/regression/usr.sbin/etcupdate/always.sh stable/10/tools/regression/usr.sbin/etcupdate/conflicts.sh stable/10/tools/regression/usr.sbin/etcupdate/fbsdid.sh stable/10/tools/regression/usr.sbin/etcupdate/ignore.sh stable/10/tools/regression/usr.sbin/etcupdate/preworld.sh stable/10/tools/regression/usr.sbin/etcupdate/tests.sh stable/10/tools/regression/usr.sbin/etcupdate/tzsetup.sh stable/10/tools/regression/usr.sbin/sa/regress.t stable/10/tools/regression/usr.sbin/sa/v1-amd64-sav.out stable/10/tools/regression/usr.sbin/sa/v1-amd64-u.out stable/10/tools/regression/usr.sbin/sa/v1-amd64-usr.out stable/10/tools/regression/usr.sbin/sa/v1-i386-sav.out stable/10/tools/regression/usr.sbin/sa/v1-i386-u.out stable/10/tools/regression/usr.sbin/sa/v1-i386-usr.out stable/10/tools/regression/usr.sbin/sa/v1-sparc64-sav.out stable/10/tools/regression/usr.sbin/sa/v1-sparc64-u.out stable/10/tools/regression/usr.sbin/sa/v1-sparc64-usr.out stable/10/tools/regression/usr.sbin/sa/v2-amd64-u.out stable/10/tools/regression/usr.sbin/sa/v2-i386-u.out stable/10/tools/regression/usr.sbin/sa/v2-sparc64-u.out Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/net/bpf_filter.c == --- stable/10/sys/net/bpf_filter.c Mon Apr 14 12:49:18 2014 (r264456) +++ stable/10/sys/net/bpf_filter.c Mon Apr 14 13:30:08 2014 (r264457) @@ -39,6 +39,9 @@ __FBSDID($FreeBSD$); #include sys/param.h +#if !defined(_KERNEL) +#include strings.h +#endif #if !defined(_KERNEL) || defined(sun) #include netinet/in.h #endif Modified: stable/10/tools/regression/lib/libc/net/Makefile == --- stable/10/tools/regression/lib/libc/net/MakefileMon Apr
svn commit: r264483 - in stable/10: bin/date/tests bin/mv/tests bin/pax/tests bin/sh/tests bin/test/tests lib/atf/libatf-c++/tests lib/atf/libatf-c++/tests/detail lib/atf/libatf-c/tests lib/atf/lib...
Author: jmmv
Date: Mon Apr 14 23:51:57 2014
New Revision: 264483
URL: http://svnweb.freebsd.org/changeset/base/264483
Log:
MFC refactoring of the *.test.mk files.
- r263161 Make bsd.test.mk the only public mk fragment for the building of
tests.
- r263172 Move FreeBSD Test Suite-specific code to a suite.test.mk file.
- r263204 Add some documentation for bsd.test.mk.
- r263217 Document support for TAP-compliant Perl test programs.
This is make tinderbox clean.
Added:
stable/10/share/mk/suite.test.mk
- copied unchanged from r263172, head/share/mk/suite.test.mk
Modified:
stable/10/bin/date/tests/Makefile
stable/10/bin/mv/tests/Makefile
stable/10/bin/pax/tests/Makefile
stable/10/bin/sh/tests/Makefile
stable/10/bin/test/tests/Makefile
stable/10/lib/atf/libatf-c++/tests/Makefile
stable/10/lib/atf/libatf-c++/tests/detail/Makefile
stable/10/lib/atf/libatf-c/tests/Makefile
stable/10/lib/atf/libatf-c/tests/detail/Makefile
stable/10/lib/atf/tests/test-programs/Makefile
stable/10/lib/libcrypt/tests/Makefile
stable/10/libexec/atf/atf-check/tests/Makefile
stable/10/share/examples/tests/tests/atf/Makefile
stable/10/share/examples/tests/tests/plain/Makefile
stable/10/share/mk/Makefile
stable/10/share/mk/atf.test.mk
stable/10/share/mk/bsd.README
stable/10/share/mk/bsd.test.mk
stable/10/share/mk/plain.test.mk
stable/10/share/mk/tap.test.mk
stable/10/tests/sys/kern/Makefile
stable/10/usr.bin/atf/atf-sh/tests/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/bin/date/tests/Makefile
==
--- stable/10/bin/date/tests/Makefile Mon Apr 14 22:49:37 2014
(r264482)
+++ stable/10/bin/date/tests/Makefile Mon Apr 14 23:51:57 2014
(r264483)
@@ -6,4 +6,4 @@ TESTSDIR= ${TESTSBASE}/bin/date
TAP_TESTS_SH= legacy_test
-.include tap.test.mk
+.include bsd.test.mk
Modified: stable/10/bin/mv/tests/Makefile
==
--- stable/10/bin/mv/tests/Makefile Mon Apr 14 22:49:37 2014
(r264482)
+++ stable/10/bin/mv/tests/Makefile Mon Apr 14 23:51:57 2014
(r264483)
@@ -6,4 +6,4 @@ TESTSDIR= ${TESTSBASE}/bin/mv
TAP_TESTS_SH= legacy_test
-.include tap.test.mk
+.include bsd.test.mk
Modified: stable/10/bin/pax/tests/Makefile
==
--- stable/10/bin/pax/tests/MakefileMon Apr 14 22:49:37 2014
(r264482)
+++ stable/10/bin/pax/tests/MakefileMon Apr 14 23:51:57 2014
(r264483)
@@ -6,4 +6,4 @@ TESTSDIR= ${TESTSBASE}/bin/pax
TAP_TESTS_PERL=legacy_test
-.include tap.test.mk
+.include bsd.test.mk
Modified: stable/10/bin/sh/tests/Makefile
==
--- stable/10/bin/sh/tests/Makefile Mon Apr 14 22:49:37 2014
(r264482)
+++ stable/10/bin/sh/tests/Makefile Mon Apr 14 23:51:57 2014
(r264483)
@@ -15,4 +15,4 @@ TEST_METADATA.legacy_test+= required_use
SUBDIR+= builtins errors execution expansion parameters parser set-e
-.include tap.test.mk
+.include bsd.test.mk
Modified: stable/10/bin/test/tests/Makefile
==
--- stable/10/bin/test/tests/Makefile Mon Apr 14 22:49:37 2014
(r264482)
+++ stable/10/bin/test/tests/Makefile Mon Apr 14 23:51:57 2014
(r264483)
@@ -12,4 +12,4 @@ TAP_TESTS_SH= legacy_test
# requested. See https://code.google.com/p/kyua/issues/detail?id=6
TEST_METADATA.legacy_test+= required_user=unprivileged
-.include tap.test.mk
+.include bsd.test.mk
Modified: stable/10/lib/atf/libatf-c++/tests/Makefile
==
--- stable/10/lib/atf/libatf-c++/tests/Makefile Mon Apr 14 22:49:37 2014
(r264482)
+++ stable/10/lib/atf/libatf-c++/tests/Makefile Mon Apr 14 23:51:57 2014
(r264483)
@@ -28,4 +28,4 @@ SRCS.${_T}= ${_T}.cpp test_helpers.cpp
ATF_TESTS_SH= pkg_config_test
-.include atf.test.mk
+.include bsd.test.mk
Modified: stable/10/lib/atf/libatf-c++/tests/detail/Makefile
==
--- stable/10/lib/atf/libatf-c++/tests/detail/Makefile Mon Apr 14 22:49:37
2014(r264482)
+++ stable/10/lib/atf/libatf-c++/tests/detail/Makefile Mon Apr 14 23:51:57
2014(r264483)
@@ -29,4 +29,4 @@ BINDIR.${p}= ${TESTSDIR}
version_helper.o: atf-version
.include ../../../common.mk
-.include atf.test.mk
+.include bsd.test.mk
Modified: stable/10/lib/atf/libatf-c/tests/Makefile
==
--- stable/10/lib/atf/libatf-c/tests/Makefile Mon Apr 14 22:49:37 2014
(r264482)
+++ stable/10/lib/atf/libatf-c/tests/Makefile
svn commit: r264408 - head/tools/build/options
Author: jmmv Date: Sun Apr 13 11:29:52 2014 New Revision: 264408 URL: http://svnweb.freebsd.org/changeset/base/264408 Log: Fix test suite name in src.conf(5). There is no such thing as the Kyua test suite; it is the FreeBSD Test Suite. While doing this, point readers to tests(7). Modified: head/tools/build/options/WITH_TESTS Modified: head/tools/build/options/WITH_TESTS == --- head/tools/build/options/WITH_TESTS Sun Apr 13 11:10:36 2014 (r264407) +++ head/tools/build/options/WITH_TESTS Sun Apr 13 11:29:52 2014 (r264408) @@ -1,2 +1,7 @@ .\ $FreeBSD$ -Set to install the Kyua test suite. +Set to install the +.Fx +Test Suite. +See +.Xr tests 7 +for more details. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r264409 - head/share/man/man5
Author: jmmv Date: Sun Apr 13 11:31:41 2014 New Revision: 264409 URL: http://svnweb.freebsd.org/changeset/base/264409 Log: Regen after rewording of WITH_TESTS. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Sun Apr 13 11:29:52 2014 (r264408) +++ head/share/man/man5/src.conf.5 Sun Apr 13 11:31:41 2014 (r264409) @@ -1,7 +1,7 @@ .\ DO NOT EDIT-- this file is automatically generated. .\ from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\ $FreeBSD$ -.Dd March 5, 2014 +.Dd April 13, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -136,13 +136,13 @@ toolchain is enabled. .\ from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru Set to not build Bluetooth related kernel modules, programs and libraries. .It Va WITHOUT_BMAKE -.\ from FreeBSD: head/tools/build/options/WITHOUT_BMAKE 250839 2013-05-21 00:41:49Z delphij +.\ from FreeBSD: head/tools/build/options/WITHOUT_BMAKE 263089 2014-03-12 11:53:35Z jmmv Set to not build and install the portable BSD make (bmake) as .Xr make 1 instead of the traditional FreeBSD make. This build option is temporary. -It allows developers to switch to bmake in order to work out any remaining -kinks or issues. +It allows developers to switch to the traditional FreeBSD make in order to +work out any remaining kinks or issues. This option will be removed in due time. .It Va WITHOUT_BOOT .\ from FreeBSD: head/tools/build/options/WITHOUT_BOOT 156932 2006-03-21 07:50:50Z ru @@ -214,7 +214,7 @@ When set, it also enforces the following Set to build the Clang C/C++ compiler. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. .It Va WITH_CLANG_EXTRAS .\ from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. @@ -224,7 +224,7 @@ Set to avoid building the ARCMigrate, Re the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, arm/armv6, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. +arm/arm, arm/armeb, arm/armv6, arm/armv6hf, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. .It Va WITH_CLANG_FULL .\ from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the @@ -251,7 +251,7 @@ and .Pa /usr/bin/cpp . .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6, i386/i386 and pc98/i386. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386. .It Va WITHOUT_CPP .\ from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru Set to not build @@ -349,16 +349,6 @@ Set to avoid installing examples to .\ from FreeBSD: head/tools/build/options/WITHOUT_FDT 221539 2011-05-06 19:10:27Z ru Set to not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. -.Pp -It is a default setting on -amd64/amd64, i386/i386, ia64/ia64, pc98/i386 and sparc64/sparc64. -.It Va WITH_FDT -.\ from FreeBSD: head/tools/build/options/WITH_FDT 221730 2011-05-10 11:14:40Z ru -Set to build Flattened Device Tree support as part of the base system. -This includes the device tree compiler (dtc) and libfdt support library. -.Pp -It is a default setting on -arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64. .It Va WITHOUT_FLOPPY .\ from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs @@ -393,7 +383,7 @@ Set to not build games. Set to not build and install gcc and g++. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6 and i386/i386. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf and i386/i386. .It Va WITH_GCC .\ from FreeBSD: head/tools/build/options/WITH_GCC 255326 2013-09-06 20:49:48Z zeising Set to build and install gcc and g++. @@ -429,7 +419,7 @@ Do not build the GNU C++ stack (g++, lib This is the default on platforms where clang is the system compiler. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6, i386/i386 and pc98/i386. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386. .It Va WITH_GNUCXX .\ from FreeBSD: head/tools/build/options/WITH_GNUCXX 255321 2013-09-06 20:08:03Z theraven Build the GNU C++ stack (g++, libstdc++). @@ -652,6 +642,9 @@ and related programs. Set to build .Xr ls 1 without support for colors to
svn commit: r264410 - head/share/man/man7
Author: jmmv
Date: Sun Apr 13 11:35:42 2014
New Revision: 264410
URL: http://svnweb.freebsd.org/changeset/base/264410
Log:
Document how to install the test suite.
As part of this, install the tests(7) manual page unconditionally (not only
when WITH_TESTS=yes) so that users that have not yet enabled the build of
the test suite can read details on how to do so.
Modified:
head/share/man/man7/Makefile
head/share/man/man7/tests.7
Modified: head/share/man/man7/Makefile
==
--- head/share/man/man7/MakefileSun Apr 13 11:31:41 2014
(r264409)
+++ head/share/man/man7/MakefileSun Apr 13 11:35:42 2014
(r264410)
@@ -27,12 +27,9 @@ MAN= adding_user.7 \
sprog.7 \
stdint.7 \
sticky.7 \
+ tests.7 \
tuning.7
-.if ${MK_TESTS} != no
-MAN+= tests.7
-.endif
-
MLINKS=intro.7 miscellaneous.7
MLINKS+= security.7 securelevel.7
MLINKS+= c99.7 c.7
Modified: head/share/man/man7/tests.7
==
--- head/share/man/man7/tests.7 Sun Apr 13 11:31:41 2014(r264409)
+++ head/share/man/man7/tests.7 Sun Apr 13 11:35:42 2014(r264410)
@@ -26,7 +26,7 @@
.\ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd March 20, 2014
+.Dd April 13, 2014
.Dt TESTS 7
.Os
.Sh NAME
@@ -50,12 +50,31 @@ maintenance.
.Pp
The
.Fx
-test suite is installed in the
+test suite can be found in the
.Pa /usr/tests
hierarchy.
.Pp
This manual page describes how to run the test suite and how to configure
some of its optional features.
+.Ss Installing the test suite
+The test suite is not yet installed by default as part of
+.Fx ,
+but this is bound to change during the development of
+.Fx 11.0 .
+.Pp
+If the
+.Pa /usr/tests
+directory is missing, then you will have to enable the build of the test
+suite, rebuild your system and install the results.
+You can do so by setting
+.Sq WITH_TESTS=yes
+in your
+.Pa /etc/src.conf
+file (see
+.Xr src.conf 5
+for details)
+and rebuilding the system as described in
+.Xr build 7 .
.Ss When to run the tests?
Before diving into the details of how to run the test suite, here are some
scenarios in which you should run it:
@@ -197,7 +216,8 @@ test suite.
Top-level test suite definition file.
.El
.Sh SEE ALSO
-.Xr kyua 1 .
+.Xr kyua 1 ,
+.Xr build 7
.Sh HISTORY
This test suite first appeared in
.Fx 11.0 .
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r264412 - head/gnu/usr.bin/groff/tmac
Author: jmmv Date: Sun Apr 13 11:57:51 2014 New Revision: 264412 URL: http://svnweb.freebsd.org/changeset/base/264412 Log: Add FreeBSD 10.1 to the list of recognized releases for Fx. This version is already mentioned by 4 manual pages. Modified: head/gnu/usr.bin/groff/tmac/mdoc.local Modified: head/gnu/usr.bin/groff/tmac/mdoc.local == --- head/gnu/usr.bin/groff/tmac/mdoc.local Sun Apr 13 11:47:17 2014 (r264411) +++ head/gnu/usr.bin/groff/tmac/mdoc.local Sun Apr 13 11:57:51 2014 (r264412) @@ -59,6 +59,7 @@ .ds doc-operating-system-FreeBSD-9.19.1 .ds doc-operating-system-FreeBSD-9.29.2 .ds doc-operating-system-FreeBSD-10.0 10.0 +.ds doc-operating-system-FreeBSD-10.1 10.1 .ds doc-operating-system-FreeBSD-11.0 11.0 .ds doc-operating-system-NetBSD-7.0 7.0 . ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r264413 - head/share/man/man7
Author: jmmv Date: Sun Apr 13 11:59:42 2014 New Revision: 264413 URL: http://svnweb.freebsd.org/changeset/base/264413 Log: Miscellaneous fixes to tests(7). - Properly capitalize FreeBSD Test Suite. - At this point, the test suite first appeared in 10.1, not in 11.0. - Use my FreeBSD.org address. Modified: head/share/man/man7/tests.7 Modified: head/share/man/man7/tests.7 == --- head/share/man/man7/tests.7 Sun Apr 13 11:57:51 2014(r264412) +++ head/share/man/man7/tests.7 Sun Apr 13 11:59:42 2014(r264413) @@ -31,11 +31,11 @@ .Os .Sh NAME .Nm tests -.Nd introduction to the FreeBSD test suite +.Nd introduction to the FreeBSD Test Suite .Sh DESCRIPTION The .Fx -test suite provides a collection of automated tests for two major purposes. +Test Suite provides a collection of automated tests for two major purposes. On one hand, the test suite aids .Em developers to detect bugs and regressions when they modify the source tree. On the other @@ -50,7 +50,7 @@ maintenance. .Pp The .Fx -test suite can be found in the +Test Suite can be found in the .Pa /usr/tests hierarchy. .Pp @@ -148,7 +148,7 @@ to its manual page .Ss Configuring the tests Some test cases in the .Fx -test suite require manual configuration by the administrator before they can be +Test Suite require manual configuration by the administrator before they can be run. Unless certain properties are defined, the tests that require them will be skipped. .Pp @@ -160,7 +160,7 @@ The format of this file is detailed in .Pp The following configuration variables are available in the .Fx -test suite: +Test Suite: .Bl -tag -width allow_sysctl_side_effects .It allow_devfs_side_effects If defined, enables tests that may destroy and recreate semipermanent device @@ -211,7 +211,7 @@ Default result database used by Kyua. .It Pa /usr/tests/ Location of the .Fx -test suite. +Test Suite. .It Pa /usr/tests/Kyuafile Top-level test suite definition file. .El @@ -219,14 +219,16 @@ Top-level test suite definition file. .Xr kyua 1 , .Xr build 7 .Sh HISTORY -This test suite first appeared in -.Fx 11.0 . +The +.Fx +Test Suite first appeared in +.Fx 10.1 . .Pp The .Nm manual page first appeared in .Nx 6.0 and was later ported to -.Fx 11.0 . +.Fx 10.1 . .Sh AUTHORS -.An Julio Merino Aq Mt j...@google.com +.An Julio Merino Aq Mt j...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r264133 - head/tests/sys/kern
Author: jmmv
Date: Fri Apr 4 18:10:11 2014
New Revision: 264133
URL: http://svnweb.freebsd.org/changeset/base/264133
Log:
Fix variable type to avoid printf formatter warning.
This fixes the build under powerpc64 where gcc complains about a mismatch
between a %zd printf formatter and an int variable passed to it.
Modified:
head/tests/sys/kern/unix_seqpacket_test.c
Modified: head/tests/sys/kern/unix_seqpacket_test.c
==
--- head/tests/sys/kern/unix_seqpacket_test.c Fri Apr 4 18:07:21 2014
(r264132)
+++ head/tests/sys/kern/unix_seqpacket_test.c Fri Apr 4 18:10:11 2014
(r264133)
@@ -872,7 +872,7 @@ ATF_TC_BODY(rcvbuf_oversized, tc)
{
int i;
int sv[2];
- const int pktsize = 1024;
+ const ssize_t pktsize = 1024;
const size_t sndbufsize = 8192;
const size_t rcvbufsize = 131072;
const size_t geometric_mean_bufsize = 32768;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263989 - in head: contrib/atf contrib/atf/atf-c contrib/atf/atf-c++ contrib/atf/atf-sh etc/mtree lib/atf/libatf-c lib/atf/libatf-c++ usr.bin/atf/atf-sh
Author: jmmv
Date: Tue Apr 1 13:47:08 2014
New Revision: 263989
URL: http://svnweb.freebsd.org/changeset/base/263989
Log:
Add atf m4 files from the vendor branch.
These were originally deleted as not important but, actually we need them
in place if we want to be able to use autoconf on software that provides
atf-based tests. (That includes being able to rebuild autotest from scratch
on the Kyua cluster machines, as the automated setup does.)
Added:
head/contrib/atf/atf-c++/atf-c++.m4
- copied unchanged from r261889, vendor/atf/dist/atf-c++/atf-c++.m4
head/contrib/atf/atf-c/atf-c.m4
- copied unchanged from r261889, vendor/atf/dist/atf-c/atf-c.m4
head/contrib/atf/atf-c/atf-common.m4
- copied unchanged from r261889, vendor/atf/dist/atf-c/atf-common.m4
head/contrib/atf/atf-sh/atf-sh.m4
- copied unchanged from r261889, vendor/atf/dist/atf-sh/atf-sh.m4
Modified:
head/contrib/atf/FREEBSD-Xlist
head/etc/mtree/BSD.tests.dist
head/lib/atf/libatf-c++/Makefile
head/lib/atf/libatf-c/Makefile
head/usr.bin/atf/atf-sh/Makefile
Modified: head/contrib/atf/FREEBSD-Xlist
==
--- head/contrib/atf/FREEBSD-Xlist Tue Apr 1 12:08:58 2014
(r263988)
+++ head/contrib/atf/FREEBSD-Xlist Tue Apr 1 13:47:08 2014
(r263989)
@@ -7,7 +7,6 @@ INSTALL
Makefile*
aclocal.m4
admin/
-atf-*/atf-*.m4
atf-config/
atf-report/
atf-run/
Copied: head/contrib/atf/atf-c++/atf-c++.m4 (from r261889,
vendor/atf/dist/atf-c++/atf-c++.m4)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/atf/atf-c++/atf-c++.m4 Tue Apr 1 13:47:08 2014
(r263989, copy of r261889, vendor/atf/dist/atf-c++/atf-c++.m4)
@@ -0,0 +1,48 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list of conditions and the following disclaimer.
+dnl * Redistributions in binary form must reproduce the above copyright
+dnl notice, this list of conditions and the following disclaimer in the
+dnl documentation and/or other materials provided with the distribution.
+dnl * Neither the name of Google Inc. nor the names of its contributors
+dnl may be used to endorse or promote products derived from this software
+dnl without specific prior written permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+dnl AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+dnl LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+dnl A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+dnl OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+dnl SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+dnl LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+dnl DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+dnl THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+dnl (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dnl
+
+dnl ATF_CHECK_CXX([version-spec])
+dnl
+dnl Checks if atf-c++ is present. If version-spec is provided, ensures that
+dnl the installed version of atf-sh matches the required version. This
+dnl argument must be something like '= 0.14' and accepts any version
+dnl specification supported by pkg-config.
+dnl
+dnl Defines and substitutes ATF_CXX_CFLAGS and ATF_CXX_LIBS with the compiler
+dnl and linker flags need to build against atf-c++.
+AC_DEFUN([ATF_CHECK_CXX], [
+spec=atf-c++[]m4_default_nblank([ $1], [])
+_ATF_CHECK_ARG_WITH(
+[PKG_CHECK_MODULES([ATF_CXX], [${spec}],
+ [found=yes found_atf_cxx=yes], [found=no])],
+[required ${spec} not found])
+])
Copied: head/contrib/atf/atf-c/atf-c.m4 (from r261889,
vendor/atf/dist/atf-c/atf-c.m4)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/contrib/atf/atf-c/atf-c.m4 Tue Apr 1 13:47:08 2014
(r263989, copy of r261889, vendor/atf/dist/atf-c/atf-c.m4)
@@ -0,0 +1,48 @@
+dnl
+dnl Automated Testing Framework (atf)
+dnl
+dnl Copyright 2011 Google Inc.
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions are
+dnl met:
+dnl
+dnl * Redistributions of source code must retain the above copyright
+dnl notice, this list
Re: svn commit: r263346 - in head: etc/mtree tools/build/mk tools/regression/usr.bin/make usr.bin/make usr.bin/make/tests usr.bin/make/tests/archives/fmt_44bsd usr.bin/make/tests/archives/fmt_44bsd_mo
On Wed, Mar 26, 2014 at 12:25 AM, Dag-Erling Smørgrav d...@des.no wrote: Julio Merino j...@freebsd.org writes: Log: Migrate tools/regression/usr.bin/make/ to the new tests layout. Note that these tests are for fmake, not bmake, and thus they are not installed nor run when bmake is selected (the default). Yes, I have wasted a *ton* of time on moving tests for no real reason other than ensuring they are not left behind. But maybe, just maybe, it was not work in vain: the majority of these tests also work with bmake and the few that don't may point at broken stuff. For example, the tests for the archive feature do not work with bmake, but bmake's manpage and source tree seem to imply that they should. So... to be investigated later; need to poke sjg@. This, or a subsequent but related commit, broke the WITHOUT_BMAKE build: Apologies for not having gotten to this yet. Will try to deal with it during the weekend or next week when I'm back home. (Still traveling after AsiaBSDCon and been focusing on fixing some other issues in the testing cluster.) In the meantime: could someone enlighten me as to why !bmake is still supported? Thanks! ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263814 - head/sbin/mdconfig/tests
Author: jmmv Date: Thu Mar 27 13:15:22 2014 New Revision: 263814 URL: http://svnweb.freebsd.org/changeset/base/263814 Log: Fix path to the run.pl script to let these tests run. Submitted by: Peel, Casey Obtained from:freebsd-testing Modified: head/sbin/mdconfig/tests/legacy_test.sh Modified: head/sbin/mdconfig/tests/legacy_test.sh == --- head/sbin/mdconfig/tests/legacy_test.sh Thu Mar 27 12:59:23 2014 (r263813) +++ head/sbin/mdconfig/tests/legacy_test.sh Thu Mar 27 13:15:22 2014 (r263814) @@ -38,7 +38,7 @@ fi TESTDIR=$(dirname $(realpath $0)) -__PERL__ -w -U $TESTDIR/run $TESTDIR/mdconfig.test /dev/null +__PERL__ -w -U $TESTDIR/run.pl $TESTDIR/mdconfig.test /dev/null if [ $? -eq 0 ]; then echo ok 1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263345 - head/etc/mtree
Author: jmmv Date: Wed Mar 19 12:06:51 2014 New Revision: 263345 URL: http://svnweb.freebsd.org/changeset/base/263345 Log: Expand tabs that sneaked in into spaces. Problem introduced by r263227. Spotted by Alan Somers. Modified: head/etc/mtree/BSD.tests.dist Modified: head/etc/mtree/BSD.tests.dist == --- head/etc/mtree/BSD.tests.dist Wed Mar 19 10:42:10 2014 (r263344) +++ head/etc/mtree/BSD.tests.dist Wed Mar 19 12:06:51 2014 (r263345) @@ -116,8 +116,8 @@ printf .. sed - regress.multitest.out - .. +regress.multitest.out +.. .. tr .. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263346 - in head: etc/mtree tools/build/mk tools/regression/usr.bin/make usr.bin/make usr.bin/make/tests usr.bin/make/tests/archives/fmt_44bsd usr.bin/make/tests/archives/fmt_44bsd_mod...
Author: jmmv Date: Wed Mar 19 12:29:20 2014 New Revision: 263346 URL: http://svnweb.freebsd.org/changeset/base/263346 Log: Migrate tools/regression/usr.bin/make/ to the new tests layout. Note that these tests are for fmake, not bmake, and thus they are not installed nor run when bmake is selected (the default). Yes, I have wasted a *ton* of time on moving tests for no real reason other than ensuring they are not left behind. But maybe, just maybe, it was not work in vain: the majority of these tests also work with bmake and the few that don't may point at broken stuff. For example, the tests for the archive feature do not work with bmake, but bmake's manpage and source tree seem to imply that they should. So... to be investigated later; need to poke sjg@. Added: head/usr.bin/make/tests/ - copied from r263227, head/tools/regression/usr.bin/make/ head/usr.bin/make/tests/archives/fmt_44bsd/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/archives/fmt_44bsd/Makefile head/usr.bin/make/tests/archives/fmt_44bsd/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/archives/fmt_44bsd/test.t head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile head/usr.bin/make/tests/archives/fmt_44bsd_mod/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/archives/fmt_44bsd_mod/test.t head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/archives/fmt_oldbsd/Makefile head/usr.bin/make/tests/archives/fmt_oldbsd/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/archives/fmt_oldbsd/test.t head/usr.bin/make/tests/basic/t0/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/basic/t0/test.t head/usr.bin/make/tests/basic/t1/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/basic/t1/Makefile head/usr.bin/make/tests/basic/t1/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/basic/t1/test.t head/usr.bin/make/tests/basic/t2/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/basic/t2/Makefile head/usr.bin/make/tests/basic/t2/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/basic/t2/test.t head/usr.bin/make/tests/basic/t3/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/basic/t3/test.t head/usr.bin/make/tests/execution/ellipsis/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/execution/ellipsis/Makefile head/usr.bin/make/tests/execution/ellipsis/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/execution/ellipsis/test.t head/usr.bin/make/tests/execution/empty/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/execution/empty/Makefile head/usr.bin/make/tests/execution/empty/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/execution/empty/test.t head/usr.bin/make/tests/execution/joberr/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/execution/joberr/Makefile head/usr.bin/make/tests/execution/joberr/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/execution/joberr/test.t head/usr.bin/make/tests/execution/plus/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/execution/plus/Makefile head/usr.bin/make/tests/execution/plus/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/execution/plus/test.t head/usr.bin/make/tests/shell/builtin/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/shell/builtin/Makefile head/usr.bin/make/tests/shell/builtin/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/shell/builtin/test.t head/usr.bin/make/tests/shell/meta/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/shell/meta/Makefile head/usr.bin/make/tests/shell/meta/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/shell/meta/test.t head/usr.bin/make/tests/shell/path/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/shell/path/Makefile head/usr.bin/make/tests/shell/path/legacy_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/make/shell/path/test.t head/usr.bin/make/tests/shell/path_select/Makefile.test - copied unchanged from r263227, head/tools/regression/usr.bin/make/shell/path_select/Makefile
svn commit: r263348 - in head/usr.bin/make/tests: . archives archives/fmt_44bsd archives/fmt_44bsd_mod archives/fmt_oldbsd basic basic/t0 basic/t1 basic/t2 basic/t3 execution execution/ellipsis exe...
Author: jmmv
Date: Wed Mar 19 12:32:50 2014
New Revision: 263348
URL: http://svnweb.freebsd.org/changeset/base/263348
Log:
Add Makefiles missed in r263346.
Grrr, I wish svn clearly displayed files not yet added when about to commit.
Added:
head/usr.bin/make/tests/Makefile (contents, props changed)
head/usr.bin/make/tests/archives/Makefile (contents, props changed)
head/usr.bin/make/tests/archives/fmt_44bsd/Makefile (contents, props
changed)
head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile (contents, props
changed)
head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile (contents, props
changed)
head/usr.bin/make/tests/basic/Makefile (contents, props changed)
head/usr.bin/make/tests/basic/t0/Makefile (contents, props changed)
head/usr.bin/make/tests/basic/t1/Makefile (contents, props changed)
head/usr.bin/make/tests/basic/t2/Makefile (contents, props changed)
head/usr.bin/make/tests/basic/t3/Makefile (contents, props changed)
head/usr.bin/make/tests/execution/Makefile (contents, props changed)
head/usr.bin/make/tests/execution/ellipsis/Makefile (contents, props
changed)
head/usr.bin/make/tests/execution/empty/Makefile (contents, props changed)
head/usr.bin/make/tests/execution/joberr/Makefile (contents, props changed)
head/usr.bin/make/tests/execution/plus/Makefile (contents, props changed)
head/usr.bin/make/tests/shell/Makefile (contents, props changed)
head/usr.bin/make/tests/shell/builtin/Makefile (contents, props changed)
head/usr.bin/make/tests/shell/meta/Makefile (contents, props changed)
head/usr.bin/make/tests/shell/path/Makefile (contents, props changed)
head/usr.bin/make/tests/shell/path_select/Makefile (contents, props changed)
head/usr.bin/make/tests/shell/replace/Makefile (contents, props changed)
head/usr.bin/make/tests/shell/select/Makefile (contents, props changed)
head/usr.bin/make/tests/suffixes/Makefile (contents, props changed)
head/usr.bin/make/tests/suffixes/basic/Makefile (contents, props changed)
head/usr.bin/make/tests/suffixes/src_wild1/Makefile (contents, props
changed)
head/usr.bin/make/tests/suffixes/src_wild2/Makefile (contents, props
changed)
head/usr.bin/make/tests/syntax/Makefile (contents, props changed)
head/usr.bin/make/tests/syntax/directive-t0/Makefile (contents, props
changed)
head/usr.bin/make/tests/syntax/enl/Makefile (contents, props changed)
head/usr.bin/make/tests/syntax/funny-targets/Makefile (contents, props
changed)
head/usr.bin/make/tests/syntax/semi/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t0/2/1/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t0/2/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t0/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t0/mk/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t1/2/1/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t1/2/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t1/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t1/mk/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t2/2/1/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t2/2/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t2/Makefile (contents, props changed)
head/usr.bin/make/tests/sysmk/t2/mk/Makefile (contents, props changed)
head/usr.bin/make/tests/variables/Makefile (contents, props changed)
head/usr.bin/make/tests/variables/modifier_M/Makefile (contents, props
changed)
head/usr.bin/make/tests/variables/modifier_t/Makefile (contents, props
changed)
head/usr.bin/make/tests/variables/opt_V/Makefile (contents, props changed)
head/usr.bin/make/tests/variables/t0/Makefile (contents, props changed)
Added: head/usr.bin/make/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/MakefileWed Mar 19 12:32:50 2014
(r263348)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/usr.bin/make
+
+FILESDIR= ${TESTSDIR}
+FILES= common.sh
+FILES+=test-new.mk
+
+TESTS_SUBDIRS= archives
+TESTS_SUBDIRS+=basic
+TESTS_SUBDIRS+=execution
+TESTS_SUBDIRS+=shell
+TESTS_SUBDIRS+=suffixes
+TESTS_SUBDIRS+=syntax
+TESTS_SUBDIRS+=sysmk
+TESTS_SUBDIRS+=variables
+
+.include bsd.test.mk
Added: head/usr.bin/make/tests/archives/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/make/tests/archives/Makefile Wed Mar 19 12:32:50 2014
(r263348)
@@ -0,0 +1,7 @@
+#
svn commit: r263351 - in head: bin/pkill bin/pkill/tests etc/mtree tools/regression/usr.bin/pkill
Author: jmmv Date: Wed Mar 19 12:46:04 2014 New Revision: 263351 URL: http://svnweb.freebsd.org/changeset/base/263351 Log: Migrate tools/regression/usr.bin/pkill to the new tests layout. Interestingly, the pkill tool lives in bin, not usr.bin. Haven't bothered to check if this is because the tool moved or because the tests were originally added in the wrong place. Added: head/bin/pkill/tests/ - copied from r263227, head/tools/regression/usr.bin/pkill/ head/bin/pkill/tests/Makefile (contents, props changed) head/bin/pkill/tests/pgrep-F_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-F.t head/bin/pkill/tests/pgrep-LF_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-LF.t head/bin/pkill/tests/pgrep-P_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-P.t head/bin/pkill/tests/pgrep-U_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-U.t head/bin/pkill/tests/pgrep-_g_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-_g.t head/bin/pkill/tests/pgrep-_s_test.sh - copied unchanged from r263227, head/tools/regression/usr.bin/pkill/pgrep-_s.t head/bin/pkill/tests/pgrep-g_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-g.t head/bin/pkill/tests/pgrep-i_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-i.t head/bin/pkill/tests/pgrep-j_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-j.t head/bin/pkill/tests/pgrep-l_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-l.t head/bin/pkill/tests/pgrep-n_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-n.t head/bin/pkill/tests/pgrep-o_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-o.t head/bin/pkill/tests/pgrep-q_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-q.t head/bin/pkill/tests/pgrep-s_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-s.t head/bin/pkill/tests/pgrep-t_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-t.t head/bin/pkill/tests/pgrep-v_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-v.t head/bin/pkill/tests/pgrep-x_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pgrep-x.t head/bin/pkill/tests/pkill-F_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-F.t head/bin/pkill/tests/pkill-LF_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-LF.t head/bin/pkill/tests/pkill-P_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-P.t head/bin/pkill/tests/pkill-U_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-U.t head/bin/pkill/tests/pkill-_g_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-_g.t head/bin/pkill/tests/pkill-g_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-g.t head/bin/pkill/tests/pkill-i_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-i.t head/bin/pkill/tests/pkill-j_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-j.t head/bin/pkill/tests/pkill-s_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-s.t head/bin/pkill/tests/pkill-t_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-t.t head/bin/pkill/tests/pkill-x_test.sh - copied, changed from r263227, head/tools/regression/usr.bin/pkill/pkill-x.t Deleted: head/bin/pkill/tests/pgrep-F.t head/bin/pkill/tests/pgrep-LF.t head/bin/pkill/tests/pgrep-P.t head/bin/pkill/tests/pgrep-U.t head/bin/pkill/tests/pgrep-_g.t head/bin/pkill/tests/pgrep-_s.t head/bin/pkill/tests/pgrep-g.t head/bin/pkill/tests/pgrep-i.t head/bin/pkill/tests/pgrep-j.t head/bin/pkill/tests/pgrep-l.t head/bin/pkill/tests/pgrep-n.t head/bin/pkill/tests/pgrep-o.t head/bin/pkill/tests/pgrep-q.t head/bin/pkill/tests/pgrep-s.t head/bin/pkill/tests/pgrep-t.t head/bin/pkill/tests/pgrep-v.t head/bin/pkill/tests/pgrep-x.t head/bin/pkill/tests/pkill-F.t head/bin/pkill/tests/pkill-LF.t head/bin/pkill/tests/pkill-P.t head/bin/pkill/tests/pkill-U.t head/bin/pkill/tests/pkill-_g.t head/bin/pkill/tests/pkill-g.t head/bin/pkill/tests/pkill-i.t head/bin/pkill/tests/pkill-j.t head/bin/pkill/tests/pkill-s.t head/bin/pkill/tests/pkill-t.t head/bin/pkill/tests/pkill-x.t head/tools/regression/usr.bin/pkill/ Modified:
svn commit: r263352 - head/tools/regression/priv
Author: jmmv
Date: Wed Mar 19 12:51:40 2014
New Revision: 263352
URL: http://svnweb.freebsd.org/changeset/base/263352
Log:
Make the priv test program exit with non-zero if any failures are detected.
And, mind you, this already returns a failure :-/
Modified:
head/tools/regression/priv/main.c
Modified: head/tools/regression/priv/main.c
==
--- head/tools/regression/priv/main.c Wed Mar 19 12:46:04 2014
(r263351)
+++ head/tools/regression/priv/main.c Wed Mar 19 12:51:40 2014
(r263352)
@@ -53,6 +53,16 @@
#include main.h
/*
+ * If true, some test or preparatory step failed along the execution of this
+ * program.
+ *
+ * Intuitively, we would define a counter instead of a boolean. However,
+ * we fork to run the subtests and keeping proper track of the number of
+ * failed tests would be tricky and not provide any real value.
+ */
+static int something_failed = 0;
+
+/*
* Registration table of privilege tests. Each test registers a name, a test
* function, and a cleanup function to run after the test has completed,
* regardless of success/failure.
@@ -358,13 +368,18 @@ expect(const char *test, int error, int
{
if (error == 0) {
- if (expected_error != 0)
+ if (expected_error != 0) {
+ something_failed = 1;
warnx(%s: returned 0, test);
+ }
} else {
- if (expected_error == 0)
+ if (expected_error == 0) {
+ something_failed = 1;
warn(%s: returned (%d, %d), test, error, errno);
- else if (expected_errno != errno)
+ } else if (expected_errno != errno) {
+ something_failed = 1;
warn(%s: returned (%d, %d), test, error, errno);
+ }
}
}
@@ -488,14 +503,24 @@ run(struct test *test, int asroot, int i
run_child(test, asroot, injail);
fflush(stdout);
fflush(stderr);
- exit(0);
+ exit(something_failed ? EXIT_FAILURE : EXIT_SUCCESS);
} else {
while (1) {
- pid = waitpid(childpid, NULL, 0);
- if (pid == -1)
+ int status;
+ pid = waitpid(childpid, status, 0);
+ if (pid == -1) {
+ something_failed = 1;
warn(test: waitpid %s, test-t_name);
- if (pid == childpid)
+ }
+ if (pid == childpid) {
+ if (WIFEXITED(status)
+ WEXITSTATUS(status) == EXIT_SUCCESS) {
+ /* All good in the subprocess! */
+ } else {
+ something_failed = 1;
+ }
break;
+ }
}
}
fflush(stdout);
@@ -530,5 +555,5 @@ main(int argc, char *argv[])
run(tests[i], 1, 0);
run(tests[i], 1, 1);
}
- return (0);
+ return (something_failed ? EXIT_FAILURE : EXIT_SUCCESS);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263353 - head/tools/regression/priv
Author: jmmv Date: Wed Mar 19 12:52:49 2014 New Revision: 263353 URL: http://svnweb.freebsd.org/changeset/base/263353 Log: errx prepends the program name to the message; don't do it by hand. Modified: head/tools/regression/priv/main.c Modified: head/tools/regression/priv/main.c == --- head/tools/regression/priv/main.c Wed Mar 19 12:51:40 2014 (r263352) +++ head/tools/regression/priv/main.c Wed Mar 19 12:52:49 2014 (r263353) @@ -543,7 +543,7 @@ main(int argc, char *argv[]) * force the use of privilege, and will likely need checking. */ if (getuid() != 0 geteuid() != 0) - errx(-1, priv: must be run as root); + errx(-1, must be run as root); /* * Run each test four times, varying whether the process is running ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263362 - head/sys/net
Author: jmmv Date: Wed Mar 19 13:10:25 2014 New Revision: 263362 URL: http://svnweb.freebsd.org/changeset/base/263362 Log: Include strings.h so that bpf_filter.c can be built in userland. This is to bring in a definition for bzero(3), which in turn allows the tests in tools/regression/bpf/ to build again. Modified: head/sys/net/bpf_filter.c Modified: head/sys/net/bpf_filter.c == --- head/sys/net/bpf_filter.c Wed Mar 19 13:09:38 2014(r263361) +++ head/sys/net/bpf_filter.c Wed Mar 19 13:10:25 2014(r263362) @@ -39,6 +39,9 @@ __FBSDID($FreeBSD$); #include sys/param.h +#if !defined(_KERNEL) +#include strings.h +#endif #if !defined(_KERNEL) || defined(sun) #include netinet/in.h #endif ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263388 - head/usr.bin/sed/tests
Author: jmmv
Date: Wed Mar 19 23:29:00 2014
New Revision: 263388
URL: http://svnweb.freebsd.org/changeset/base/263388
Log:
Mark multi_test as requiring /usr/share/dict/words.
The file may not be present if MK_DICT=no. Pointed out by Casey Peel.
Modified:
head/usr.bin/sed/tests/Makefile
Modified: head/usr.bin/sed/tests/Makefile
==
--- head/usr.bin/sed/tests/Makefile Wed Mar 19 23:22:25 2014
(r263387)
+++ head/usr.bin/sed/tests/Makefile Wed Mar 19 23:29:00 2014
(r263388)
@@ -4,6 +4,7 @@ TESTSDIR= ${TESTSBASE}/usr.bin/sed
TAP_TESTS_SH= legacy_test
TAP_TESTS_SH+= multi_test
+TEST_METADATA.multi_test+= required_files=/usr/share/dict/words
TAP_TESTS_SH+= inplace_race_test
FILESDIR= ${TESTSDIR}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263227 - in head: etc/mtree tools/regression/usr.bin tools/regression/usr.bin/apply tools/regression/usr.bin/calendar tools/regression/usr.bin/comm tools/regression/usr.bin/file2c tool...
Author: jmmv Date: Sun Mar 16 08:04:06 2014 New Revision: 263227 URL: http://svnweb.freebsd.org/changeset/base/263227 Log: Migrate most of tools/regression/usr.bin/ to the new tests layout. I'm starting with the easy cases. The leftovers need to be looked at a bit more closely. Note that this change _does_ modify the code of the old tests. This is required in order to allow the code to locate the data files in the source directory instead of the current directory, because Kyua automatically changes the latter to a temporary directory. Also note that at least one test is known to be broken here. Actually, the test is not really broken: it's marked as a TODO but unfortunately Kyua's TAP parser currently does not understand that. Will have to be fixed separately. Added: head/usr.bin/apply/tests/ - copied from r263226, head/tools/regression/usr.bin/apply/ head/usr.bin/apply/tests/legacy_test.sh - copied, changed from r263226, head/tools/regression/usr.bin/apply/regress.t head/usr.bin/calendar/tests/ - copied from r263225, head/tools/regression/usr.bin/calendar/ head/usr.bin/calendar/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/calendar/regress.t head/usr.bin/comm/tests/ - copied from r263225, head/tools/regression/usr.bin/comm/ head/usr.bin/comm/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/comm/regress.t head/usr.bin/file2c/tests/ - copied from r263225, head/tools/regression/usr.bin/file2c/ head/usr.bin/file2c/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/file2c/regress.t head/usr.bin/join/tests/ - copied from r263225, head/tools/regression/usr.bin/join/ head/usr.bin/join/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/join/regress.t head/usr.bin/jot/tests/ - copied from r263225, head/tools/regression/usr.bin/jot/ head/usr.bin/jot/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/jot/regress.t head/usr.bin/m4/tests/ - copied from r263225, head/tools/regression/usr.bin/m4/ head/usr.bin/m4/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/m4/regress.t head/usr.bin/ncal/tests/ - copied from r263225, head/tools/regression/usr.bin/ncal/ head/usr.bin/ncal/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/ncal/regress.t head/usr.bin/printf/tests/ - copied from r263225, head/tools/regression/usr.bin/printf/ head/usr.bin/printf/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/printf/regress.t head/usr.bin/sed/tests/ - copied from r263225, head/tools/regression/usr.bin/sed/ head/usr.bin/sed/tests/inplace_race_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/sed/inplace_race.t head/usr.bin/sed/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/sed/regress.t head/usr.bin/sed/tests/multi_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/sed/multitest.t head/usr.bin/sed/tests/regress.multitest.out/Makefile (contents, props changed) head/usr.bin/tests/regress.m4 - copied, changed from r263225, head/tools/regression/usr.bin/regress.m4 head/usr.bin/tr/tests/ - copied from r263225, head/tools/regression/usr.bin/tr/ head/usr.bin/tr/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/tr/regress.t head/usr.bin/uudecode/tests/ - copied from r263225, head/tools/regression/usr.bin/uudecode/ head/usr.bin/uudecode/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/uudecode/regress.t head/usr.bin/uuencode/tests/ - copied from r263225, head/tools/regression/usr.bin/uuencode/ head/usr.bin/uuencode/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/uuencode/regress.t head/usr.bin/xargs/tests/ - copied from r263225, head/tools/regression/usr.bin/xargs/ head/usr.bin/xargs/tests/legacy_test.sh - copied, changed from r263225, head/tools/regression/usr.bin/xargs/regress.t head/usr.bin/yacc/tests/ - copied from r263225, head/tools/regression/usr.bin/yacc/ head/usr.bin/yacc/tests/legacy_test.sh (contents, props changed) - copied, changed from r263225, head/tools/regression/usr.bin/yacc/regress.t Deleted: head/tools/regression/usr.bin/Makefile head/tools/regression/usr.bin/apply/ head/tools/regression/usr.bin/calendar/ head/tools/regression/usr.bin/comm/ head/tools/regression/usr.bin/file2c/ head/tools/regression/usr.bin/join/ head/tools/regression/usr.bin/jot/ head/tools/regression/usr.bin/m4/ head/tools/regression/usr.bin/ncal/ head/tools/regression/usr.bin/printf/
svn commit: r263204 - head/share/mk
Author: jmmv Date: Sat Mar 15 09:27:59 2014 New Revision: 263204 URL: http://svnweb.freebsd.org/changeset/base/263204 Log: Add some documentation for bsd.test.mk. Modified: head/share/mk/bsd.README Modified: head/share/mk/bsd.README == --- head/share/mk/bsd.READMESat Mar 15 06:49:32 2014(r263203) +++ head/share/mk/bsd.READMESat Mar 15 09:27:59 2014(r263204) @@ -39,6 +39,7 @@ bsd.prog.mk - building programs from so bsd.snmpmod.mk - building modules for the SNMP daemon bsnmpd bsd.subdir.mk - targets for building subdirectories bsd.sys.mk - common settings used for building FreeBSD sources +bsd.test.mk- building test programs from source files sys.mk - default rules for all makes This file does not document bsd.port*.mk. They are documented in ports(7). @@ -365,3 +366,86 @@ It has rules for building profiled objec built by default. Libraries are ranlib'd before installation. + +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + +The include file bsd.test.mk handles building one or more test programs +intended to be used in the FreeBSD Test Suite under /usr/tests/. + +It has seven targets: + + all: + build the test programs. + clean: + remove the test programs and any object files. + cleandir: + remove all of the files removed by the target clean, as + well as .depend and tags. + depend: + make the dependencies for the source files, and store + them in the file .depend. + install: +install the test programs and their data files; if the +Makefile does not itself define the target install, the +targets beforeinstall and afterinstall may also be used +to cause actions immediately before and after the +install target is executed. + lint: + run lint on the source files. + tags: + create a tags file for the source files. + test: + runs the test programs from the object directory; if the + Makefile does not itself define the target test, the + targets beforetest and aftertest may also be used to + cause actions immediately before and after the test + target is executed. + +It sets/uses the following variables, among many others: + +TESTDIRPath to the installed tests. Must be a subdirectory of + TESTSBASE and the subpath should match the relative + location of the tests within the src tree. + +KYUAFILE If 'auto' (the default), generate a Kyuafile out of the + test programs defined in the Makefile. If 'yes', then a + manually-crafted Kyuafile must be supplied with the + sources. If 'no', no Kyuafile is installed (useful for + subdirectories providing helper programs or data files + only). + +ATF_TESTS_CThe names of the ATF C test programs to build. + +ATF_TESTS_CXX The names of the ATF C++ test programs to build. + +ATF_TESTS_SH The names of the ATF sh test programs to build. + +PLAIN_TESTS_C The names of the plain (legacy) programs to build. + +PLAIN_TESTS_CXXThe names of the plain (legacy) test programs to build. + +PLAIN_TESTS_SH The names of the plain (legacy) test programs to build. + +TAP_TESTS_CThe names of the TAP-compliant C test programs to build. + +TAP_TESTS_CXX The names of the TAP-compliant C++ test programs to + build. + +TAP_TESTS_SH The names of the TAP-compliant sh test programs to + build. + +TESTS_SUBDIRS List of subdirectories containing tests into which to + recurse. Differs from SUBDIR in that these directories + get registered into the automatically-generated + Kyuafile (if any). + +NOT_FOR_TEST_SUITE + If defined, none of the built test programs get + installed under /usr/tests/ and no Kyuafile is + automatically generated. Should not be used within the + FreeBSD source tree but is provided for the benefit of + third-parties. + +The actual building of the test programs is performed by bsd.prog.mk. +Please see the documentation above for this other file for additional +details on the behavior of bsd.test.mk. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263217 - head/share/mk
Author: jmmv Date: Sun Mar 16 01:22:23 2014 New Revision: 263217 URL: http://svnweb.freebsd.org/changeset/base/263217 Log: Document support for TAP-compliant Perl test programs. Modified: head/share/mk/bsd.README Modified: head/share/mk/bsd.README == --- head/share/mk/bsd.READMESun Mar 16 01:17:09 2014(r263216) +++ head/share/mk/bsd.READMESun Mar 16 01:22:23 2014(r263217) @@ -426,11 +426,22 @@ PLAIN_TESTS_CXX The names of the plain ( PLAIN_TESTS_SH The names of the plain (legacy) test programs to build. +TAP_PERL_INTERPRETER + Path to the Perl interpreter to be used for + TAP-compliant test programs that are written in Perl. + Refer to TAP_TESTS_PERL for details. + TAP_TESTS_CThe names of the TAP-compliant C test programs to build. TAP_TESTS_CXX The names of the TAP-compliant C++ test programs to build. +TAP_TESTS_PERL The names of the TAP-compliant Perl test programs to + build. The corresponding source files should end with + the .pl extension; the test program is marked as + requiring Perl; and TAP_PERL_INTERPRETER is used in the + built scripts as the interpreter of choice. + TAP_TESTS_SH The names of the TAP-compliant sh test programs to build. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263220 - in head: etc/mtree sbin sbin/dhclient sbin/dhclient/tests sbin/growfs sbin/growfs/tests sbin/mdconfig sbin/mdconfig/tests sbin/tests tools/regression/sbin
Author: jmmv
Date: Sun Mar 16 02:07:08 2014
New Revision: 263220
URL: http://svnweb.freebsd.org/changeset/base/263220
Log:
Migrate tools/regression/sbin/ to the new tests layout.
Pretty much all that this change does is shuffles the code around and hooks
it into the regular build. The code of the old tests has not changed.
Added:
head/sbin/dhclient/tests/
- copied from r263215, head/tools/regression/sbin/dhclient/
head/sbin/growfs/tests/
- copied from r263215, head/tools/regression/sbin/growfs/
head/sbin/growfs/tests/legacy_test.pl
- copied, changed from r263215, head/tools/regression/sbin/growfs/regress.t
head/sbin/mdconfig/tests/
- copied from r263215, head/tools/regression/sbin/mdconfig/
head/sbin/mdconfig/tests/legacy_test.sh
- copied, changed from r263215, head/tools/regression/sbin/mdconfig/00.t
- copied unchanged from r263215, head/tools/regression/sbin/mdconfig/run
head/sbin/tests/
head/sbin/tests/Makefile (contents, props changed)
Directory Properties:
head/sbin/mdconfig/tests/run.pl (props changed)
Deleted:
head/sbin/growfs/tests/regress.t
head/sbin/mdconfig/tests/00.t
head/sbin/mdconfig/tests/run
head/tools/regression/sbin/
Modified:
head/etc/mtree/BSD.tests.dist
head/sbin/Makefile
head/sbin/dhclient/Makefile
head/sbin/dhclient/tests/Makefile
head/sbin/growfs/Makefile
head/sbin/growfs/tests/Makefile
head/sbin/mdconfig/Makefile
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Sun Mar 16 01:55:30 2014
(r263219)
+++ head/etc/mtree/BSD.tests.dist Sun Mar 16 02:07:08 2014
(r263220)
@@ -68,6 +68,14 @@
..
..
..
+sbin
+dhclient
+..
+growfs
+..
+mdconfig
+..
+..
share
examples
tests
Modified: head/sbin/Makefile
==
--- head/sbin/Makefile Sun Mar 16 01:55:30 2014(r263219)
+++ head/sbin/Makefile Sun Mar 16 02:07:08 2014(r263220)
@@ -118,6 +118,10 @@ SUBDIR+= quotacheck
SUBDIR+= routed
.endif
+.if ${MK_TESTS} != no
+SUBDIR+= tests
+.endif
+
.include bsd.arch.inc.mk
SUBDIR:= ${SUBDIR:O}
Modified: head/sbin/dhclient/Makefile
==
--- head/sbin/dhclient/Makefile Sun Mar 16 01:55:30 2014(r263219)
+++ head/sbin/dhclient/Makefile Sun Mar 16 02:07:08 2014(r263220)
@@ -31,6 +31,8 @@
# OF THE POSSIBILITY OF SUCH DAMAGE.
#
+.include bsd.own.mk
+
SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
parse.c privsep.c
@@ -44,4 +46,8 @@ LDADD=-lutil
WARNS?=2
+.if ${MK_TESTS} != no
+SUBDIR+=tests
+.endif
+
.include bsd.prog.mk
Modified: head/sbin/dhclient/tests/Makefile
==
--- head/tools/regression/sbin/dhclient/MakefileSun Mar 16 00:57:26
2014(r263215)
+++ head/sbin/dhclient/tests/Makefile Sun Mar 16 02:07:08 2014
(r263220)
@@ -1,17 +1,15 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../sbin/dhclient
+TESTSDIR= ${TESTSBASE}/sbin/dhclient
-SRCS= alloc.c convert.c hash.c options.c tables.c \
- fake.c \
- option-domain-search.c
+.PATH: ${.CURDIR}/..
-CFLAGS+= -I${.CURDIR}/../../../../sbin/dhclient
-LDADD= -lutil
+PLAIN_TESTS_C= option-domain-search_test
+SRCS.option-domain-search_test=alloc.c convert.c hash.c
options.c \
+ tables.c fake.c option-domain-search.c
+CFLAGS.option-domain-search_test+= -I${.CURDIR}/..
+LDADD.option-domain-search_test= -lutil
-PROG= option-domain-search
-
-NO_MAN=
WARNS?=2
-.include bsd.prog.mk
+.include bsd.test.mk
Modified: head/sbin/growfs/Makefile
==
--- head/sbin/growfs/Makefile Sun Mar 16 01:55:30 2014(r263219)
+++ head/sbin/growfs/Makefile Sun Mar 16 02:07:08 2014(r263220)
@@ -6,6 +6,8 @@
#GFSDBG=
+.include bsd.own.mk
+
.PATH: ${.CURDIR}/../mount
PROG= growfs
@@ -20,4 +22,8 @@ SRCS+= debug.c
DPADD= ${LIBUTIL}
LDADD= -lutil
+.if ${MK_TESTS} != no
+SUBDIR+=tests
+.endif
+
.include bsd.prog.mk
Modified: head/sbin/growfs/tests/Makefile
==
--- head/tools/regression/sbin/growfs/Makefile Sun Mar 16 00:57:26 2014
(r263215)
+++ head/sbin/growfs/tests/Makefile Sun Mar 16
svn commit: r263221 - head/tools/regression/usr.sbin/etcupdate
Author: jmmv
Date: Sun Mar 16 02:27:27 2014
New Revision: 263221
URL: http://svnweb.freebsd.org/changeset/base/263221
Log:
Change etcupdate tests to return 1 on test failures.
This is a prerequisite for hooking these tests into the test suite. And,
fortunately, all tests seem to pass!
Modified:
head/tools/regression/usr.sbin/etcupdate/always.sh
head/tools/regression/usr.sbin/etcupdate/conflicts.sh
head/tools/regression/usr.sbin/etcupdate/fbsdid.sh
head/tools/regression/usr.sbin/etcupdate/ignore.sh
head/tools/regression/usr.sbin/etcupdate/preworld.sh
head/tools/regression/usr.sbin/etcupdate/tests.sh
head/tools/regression/usr.sbin/etcupdate/tzsetup.sh
Modified: head/tools/regression/usr.sbin/etcupdate/always.sh
==
--- head/tools/regression/usr.sbin/etcupdate/always.sh Sun Mar 16 02:07:08
2014(r263220)
+++ head/tools/regression/usr.sbin/etcupdate/always.sh Sun Mar 16 02:27:27
2014(r263221)
@@ -29,6 +29,7 @@
# Various regression tests to test the -A flag to the 'update' command.
+FAILED=no
WORKDIR=work
usage()
@@ -275,6 +276,7 @@ missing()
{
if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
echo File $1 should be missing
+ FAILED=yes
fi
}
@@ -283,6 +285,7 @@ present()
{
if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then
echo File $1 should be present
+ FAILED=yes
fi
}
@@ -291,6 +294,7 @@ fifo()
{
if ! [ -p $TEST/$1 ]; then
echo File $1 should be a FIFO
+ FAILED=yes
fi
}
@@ -299,6 +303,7 @@ dir()
{
if ! [ -d $TEST/$1 ]; then
echo File $1 should be a directory
+ FAILED=yes
fi
}
@@ -310,10 +315,12 @@ link()
if ! [ -L $TEST/$1 ]; then
echo File $1 should be a link
+ FAILED=yes
elif [ $# -gt 1 ]; then
val=`readlink $TEST/$1`
if [ $val != $2 ]; then
echo Link $1 should link to \$2\
+ FAILED=yes
fi
fi
}
@@ -327,15 +334,18 @@ file()
if ! [ -f $TEST/$1 ]; then
echo File $1 should be a regular file
+ FAILED=yes
elif [ $# -eq 2 ]; then
contents=`cat $TEST/$1`
if [ $contents != $2 ]; then
echo File $1 has wrong contents
+ FAILED=yes
fi
elif [ $# -eq 3 ]; then
sum=`md5 -q $TEST/$1`
if [ $sum != $3 ]; then
echo File $1 has wrong contents
+ FAILED=yes
fi
fi
}
@@ -348,10 +358,12 @@ conflict()
if ! [ -f $CONFLICTS/$1 ]; then
echo File $1 missing conflict
+ FAILED=yes
elif [ $# -gt 1 ]; then
sum=`md5 -q $CONFLICTS/$1`
if [ $sum != $2 ]; then
echo Conflict $1 has wrong contents
+ FAILED=yes
fi
fi
}
@@ -361,11 +373,13 @@ noconflict()
{
if [ -f $CONFLICTS/$1 ]; then
echo File $1 should not have a conflict
+ FAILED=yes
fi
}
if [ `id -u` -ne 0 ]; then
echo must be root
+ exit 0
fi
if [ -r /etc/etcupdate.conf ]; then
@@ -413,7 +427,8 @@ Warnings:
EOF
echo Differences for regular:
-diff -u -L correct $WORKDIR/correct.out -L test $WORKDIR/test.out
+diff -u -L correct $WORKDIR/correct.out -L test $WORKDIR/test.out \
+|| FAILED=yes
## /first/difftype/second:
present /first/difftype/second/fifo
@@ -533,7 +548,8 @@ Warnings:
EOF
echo Differences for -A '/first*' -A '/second* /*di*':
-diff -u -L correct $WORKDIR/correct1.out -L test $WORKDIR/test1.out
+diff -u -L correct $WORKDIR/correct1.out -L test $WORKDIR/test1.out \
+|| FAILED=yes
## /first/difftype/second:
present /first/difftype/second/fifo
@@ -610,3 +626,5 @@ file /dirchange/todir/difffile/file baz
## /dirchange/todir/difftype:
file /dirchange/todir/difftype/file baz
+
+[ ${FAILED} = no ]
Modified: head/tools/regression/usr.sbin/etcupdate/conflicts.sh
==
--- head/tools/regression/usr.sbin/etcupdate/conflicts.sh Sun Mar 16
02:07:08 2014(r263220)
+++ head/tools/regression/usr.sbin/etcupdate/conflicts.sh Sun Mar 16
02:27:27 2014(r263221)
@@ -29,6 +29,7 @@
# Various regression tests to run for the 'resolve' command.
+FAILED=no
WORKDIR=work
usage()
@@ -134,6 +135,7 @@ missing()
{
if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
echo File $1 should be missing
+ FAILED=yes
fi
}
@@ -142,6 +144,7 @@ present()
{
if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then
echo File $1
svn commit: r263222 - head/sbin/mdconfig/tests
Author: jmmv
Date: Sun Mar 16 02:32:44 2014
New Revision: 263222
URL: http://svnweb.freebsd.org/changeset/base/263222
Log:
Add Makefile missed in r263220.
Added:
head/sbin/mdconfig/tests/Makefile (contents, props changed)
Added: head/sbin/mdconfig/tests/Makefile
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/mdconfig/tests/Makefile Sun Mar 16 02:32:44 2014
(r263222)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR= ${TESTSBASE}/sbin/mdconfig
+
+TAP_TESTS_SH= legacy_test
+TAP_TESTS_SH_SED_legacy_test= 's,__PERL__,${TAP_PERL_INTERPRETER},g'
+TEST_METADATA.legacy_test+=required_programs=${TAP_PERL_INTERPRETER}
+
+FILESDIR= ${TESTSDIR}
+FILES= mdconfig.test
+FILES+=run.pl
+
+.include bsd.test.mk
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263226 - in head: etc/mtree tools/regression/usr.bin tools/regression/usr.bin/lastcomm tools/regression/usr.sbin usr.bin/lastcomm usr.bin/lastcomm/tests usr.sbin usr.sbin/etcupdate usr...
Author: jmmv
Date: Sun Mar 16 04:09:22 2014
New Revision: 263226
URL: http://svnweb.freebsd.org/changeset/base/263226
Log:
Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.
This change was originally going to only migrate the usr.sbin tests but, as
it turns out, the usr.sbin/sa/ tests require files from usr.bin/lastcomm/
so it's better to just also migrate the latter at the same time. The other
usr.bin tests will be moved separately.
To make these tests work within the test suite, some of them have required
changes to prevent modifying the source directory and instead just rely on
the current directory for file manipulation.
Added:
head/usr.bin/lastcomm/tests/
- copied from r263225, head/tools/regression/usr.bin/lastcomm/
head/usr.bin/lastcomm/tests/legacy_test.sh (contents, props changed)
- copied, changed from r263225,
head/tools/regression/usr.bin/lastcomm/regress.t
head/usr.sbin/etcupdate/tests/
- copied from r263221, head/tools/regression/usr.sbin/etcupdate/
head/usr.sbin/etcupdate/tests/Makefile (contents, props changed)
- copied unchanged from r263221,
head/tools/regression/usr.sbin/etcupdate/always.sh
- copied unchanged from r263221,
head/tools/regression/usr.sbin/etcupdate/conflicts.sh
- copied unchanged from r263221,
head/tools/regression/usr.sbin/etcupdate/fbsdid.sh
- copied unchanged from r263221,
head/tools/regression/usr.sbin/etcupdate/ignore.sh
- copied unchanged from r263221,
head/tools/regression/usr.sbin/etcupdate/preworld.sh
- copied unchanged from r263221,
head/tools/regression/usr.sbin/etcupdate/tests.sh
- copied unchanged from r263221,
head/tools/regression/usr.sbin/etcupdate/tzsetup.sh
head/usr.sbin/newsyslog/tests/
- copied from r263221, head/tools/regression/usr.sbin/newsyslog/
head/usr.sbin/newsyslog/tests/legacy_test.sh (contents, props changed)
- copied, changed from r263221,
head/tools/regression/usr.sbin/newsyslog/regress.sh
head/usr.sbin/sa/tests/
- copied from r263221, head/tools/regression/usr.sbin/sa/
head/usr.sbin/sa/tests/legacy_test.sh (contents, props changed)
- copied, changed from r263221, head/tools/regression/usr.sbin/sa/regress.t
head/usr.sbin/tests/
head/usr.sbin/tests/Makefile (contents, props changed)
Directory Properties:
head/usr.sbin/etcupdate/tests/always_test.sh (props changed)
head/usr.sbin/etcupdate/tests/conflicts_test.sh (props changed)
head/usr.sbin/etcupdate/tests/fbsdid_test.sh (props changed)
head/usr.sbin/etcupdate/tests/ignore_test.sh (props changed)
head/usr.sbin/etcupdate/tests/preworld_test.sh (props changed)
head/usr.sbin/etcupdate/tests/tests_test.sh (props changed)
head/usr.sbin/etcupdate/tests/tzsetup_test.sh (props changed)
Deleted:
head/tools/regression/usr.bin/lastcomm/
head/tools/regression/usr.sbin/
head/usr.bin/lastcomm/tests/regress.t
head/usr.sbin/etcupdate/tests/always.sh
head/usr.sbin/etcupdate/tests/conflicts.sh
head/usr.sbin/etcupdate/tests/fbsdid.sh
head/usr.sbin/etcupdate/tests/ignore.sh
head/usr.sbin/etcupdate/tests/preworld.sh
head/usr.sbin/etcupdate/tests/tests.sh
head/usr.sbin/etcupdate/tests/tzsetup.sh
head/usr.sbin/newsyslog/tests/regress.sh
head/usr.sbin/newsyslog/tests/regress.t
head/usr.sbin/sa/tests/regress.t
Modified:
head/etc/mtree/BSD.tests.dist
head/tools/regression/usr.bin/Makefile
head/usr.bin/lastcomm/Makefile
head/usr.bin/lastcomm/tests/Makefile
head/usr.bin/lastcomm/tests/values.sh (contents, props changed)
head/usr.sbin/Makefile
head/usr.sbin/etcupdate/Makefile
head/usr.sbin/newsyslog/Makefile
head/usr.sbin/newsyslog/tests/Makefile
head/usr.sbin/sa/Makefile
head/usr.sbin/sa/tests/Makefile
head/usr.sbin/sa/tests/prime.sh (contents, props changed)
Modified: head/etc/mtree/BSD.tests.dist
==
--- head/etc/mtree/BSD.tests.dist Sun Mar 16 03:32:29 2014
(r263225)
+++ head/etc/mtree/BSD.tests.dist Sun Mar 16 04:09:22 2014
(r263226)
@@ -95,6 +95,16 @@
atf-sh
..
..
+lastcomm
+..
+..
+usr.sbin
+etcupdate
+..
+newsyslog
+..
+sa
+..
..
..
..
Modified: head/tools/regression/usr.bin/Makefile
==
--- head/tools/regression/usr.bin/Makefile Sun Mar 16 03:32:29 2014
(r263225)
+++ head/tools/regression/usr.bin/Makefile Sun Mar 16 04:09:22 2014
(r263226)
@@ -2,8 +2,5 @@
SUBDIR=apply calendar comm file2c join jot m4 ncal printf sed tr
\
uudecode uuencode xargs
-.if !defined(AUTOMATED)
-SUBDIR+= lastcomm
-.endif
.include bsd.subdir.mk
Modified: head/usr.bin/lastcomm/Makefile
svn commit: r263161 - in head: bin/date/tests bin/mv/tests bin/pax/tests bin/sh/tests bin/test/tests lib/atf/libatf-c++/tests lib/atf/libatf-c++/tests/detail lib/atf/libatf-c/tests lib/atf/libatf-c...
Author: jmmv
Date: Fri Mar 14 08:56:19 2014
New Revision: 263161
URL: http://svnweb.freebsd.org/changeset/base/263161
Log:
Make bsd.test.mk the only public mk fragment for the building of tests.
Change {atf,plain,tap}.test.mk to be internal implementation details of
bsd.test.mk. Makefiles that build tests should now only include bsd.test.mk
and declaratively specify what they want to build, without worrying about
the internal implementation of the mk files.
The reason for this change is to permit building test programs of different
interfaces from a single directory, which is something I had a need for
while porting tests over from src/tools/regression/.
Additionally, this change makes it possible to perform some other requested
changes to bsd.test.mk in an easier manner. Coming soon.
Modified:
head/bin/date/tests/Makefile
head/bin/mv/tests/Makefile
head/bin/pax/tests/Makefile
head/bin/sh/tests/Makefile
head/bin/test/tests/Makefile
head/lib/atf/libatf-c++/tests/Makefile
head/lib/atf/libatf-c++/tests/detail/Makefile
head/lib/atf/libatf-c/tests/Makefile
head/lib/atf/libatf-c/tests/detail/Makefile
head/lib/atf/tests/test-programs/Makefile
head/lib/libcrypt/tests/Makefile
head/libexec/atf/atf-check/tests/Makefile
head/share/examples/tests/tests/atf/Makefile
head/share/examples/tests/tests/plain/Makefile
head/share/mk/atf.test.mk
head/share/mk/bsd.test.mk
head/share/mk/plain.test.mk
head/share/mk/tap.test.mk
head/tests/sys/kern/Makefile
head/usr.bin/atf/atf-sh/tests/Makefile
Modified: head/bin/date/tests/Makefile
==
--- head/bin/date/tests/MakefileFri Mar 14 08:43:56 2014
(r263160)
+++ head/bin/date/tests/MakefileFri Mar 14 08:56:19 2014
(r263161)
@@ -6,4 +6,4 @@ TESTSDIR= ${TESTSBASE}/bin/date
TAP_TESTS_SH= legacy_test
-.include tap.test.mk
+.include bsd.test.mk
Modified: head/bin/mv/tests/Makefile
==
--- head/bin/mv/tests/Makefile Fri Mar 14 08:43:56 2014(r263160)
+++ head/bin/mv/tests/Makefile Fri Mar 14 08:56:19 2014(r263161)
@@ -6,4 +6,4 @@ TESTSDIR= ${TESTSBASE}/bin/mv
TAP_TESTS_SH= legacy_test
-.include tap.test.mk
+.include bsd.test.mk
Modified: head/bin/pax/tests/Makefile
==
--- head/bin/pax/tests/Makefile Fri Mar 14 08:43:56 2014(r263160)
+++ head/bin/pax/tests/Makefile Fri Mar 14 08:56:19 2014(r263161)
@@ -6,4 +6,4 @@ TESTSDIR= ${TESTSBASE}/bin/pax
TAP_TESTS_PERL=legacy_test
-.include tap.test.mk
+.include bsd.test.mk
Modified: head/bin/sh/tests/Makefile
==
--- head/bin/sh/tests/Makefile Fri Mar 14 08:43:56 2014(r263160)
+++ head/bin/sh/tests/Makefile Fri Mar 14 08:56:19 2014(r263161)
@@ -15,4 +15,4 @@ TEST_METADATA.legacy_test+= required_use
SUBDIR+= builtins errors execution expansion parameters parser set-e
-.include tap.test.mk
+.include bsd.test.mk
Modified: head/bin/test/tests/Makefile
==
--- head/bin/test/tests/MakefileFri Mar 14 08:43:56 2014
(r263160)
+++ head/bin/test/tests/MakefileFri Mar 14 08:56:19 2014
(r263161)
@@ -12,4 +12,4 @@ TAP_TESTS_SH= legacy_test
# requested. See https://code.google.com/p/kyua/issues/detail?id=6
TEST_METADATA.legacy_test+= required_user=unprivileged
-.include tap.test.mk
+.include bsd.test.mk
Modified: head/lib/atf/libatf-c++/tests/Makefile
==
--- head/lib/atf/libatf-c++/tests/Makefile Fri Mar 14 08:43:56 2014
(r263160)
+++ head/lib/atf/libatf-c++/tests/Makefile Fri Mar 14 08:56:19 2014
(r263161)
@@ -28,4 +28,4 @@ SRCS.${_T}= ${_T}.cpp test_helpers.cpp
ATF_TESTS_SH= pkg_config_test
-.include atf.test.mk
+.include bsd.test.mk
Modified: head/lib/atf/libatf-c++/tests/detail/Makefile
==
--- head/lib/atf/libatf-c++/tests/detail/Makefile Fri Mar 14 08:43:56
2014(r263160)
+++ head/lib/atf/libatf-c++/tests/detail/Makefile Fri Mar 14 08:56:19
2014(r263161)
@@ -29,4 +29,4 @@ BINDIR.${p}= ${TESTSDIR}
version_helper.o: atf-version
.include ../../../common.mk
-.include atf.test.mk
+.include bsd.test.mk
Modified: head/lib/atf/libatf-c/tests/Makefile
==
--- head/lib/atf/libatf-c/tests/MakefileFri Mar 14 08:43:56 2014
(r263160)
+++ head/lib/atf/libatf-c/tests/MakefileFri Mar 14 08:56:19 2014
(r263161)
@@ -35,4 +35,4 @@
svn commit: r263172 - head/share/mk
Author: jmmv
Date: Fri Mar 14 12:52:55 2014
New Revision: 263172
URL: http://svnweb.freebsd.org/changeset/base/263172
Log:
Move FreeBSD Test Suite-specific code to a suite.test.mk file.
The new suite.test.mk file contains all the logic needed to install test
programs under /usr/tests/ and to support Kyua as the run-time engine.
This file is included by default by bsd.test.mk so Makefiles do not need
to care about its existence.
Specific Makefiles can define NOT_FOR_TEST_SUITE to indicate that whatever
test programs they are building are not supposed to be installed under
/usr/tests/ nor run by Kyua. (The effect of passing this setting is that
suite.test.mk is simply not included.)
NOT_FOR_TEST_SUITE should never be used by Makefiles in the base system.
This functionality is provided so that third-parties can hook in their
own test code, with different semantics, if they wish. This was asked
for by sjg@.
Added:
head/share/mk/suite.test.mk (contents, props changed)
Modified:
head/share/mk/Makefile
head/share/mk/bsd.test.mk
Modified: head/share/mk/Makefile
==
--- head/share/mk/Makefile Fri Mar 14 12:42:30 2014(r263171)
+++ head/share/mk/Makefile Fri Mar 14 12:52:55 2014(r263172)
@@ -46,6 +46,7 @@ FILESDIR= ${BINDIR}/mk
.if ${MK_TESTS} != no
FILES+=atf.test.mk
FILES+=plain.test.mk
+FILES+=suite.test.mk
FILES+=tap.test.mk
.endif
Modified: head/share/mk/bsd.test.mk
==
--- head/share/mk/bsd.test.mk Fri Mar 14 12:42:30 2014(r263171)
+++ head/share/mk/bsd.test.mk Fri Mar 14 12:52:55 2014(r263172)
@@ -10,14 +10,6 @@
__bsd.test.mk__:
-# Directory in which to install tests defined by the current Makefile.
-# Makefiles have to override this to point to a subdirectory of TESTSBASE.
-TESTSDIR?= .
-
-# Name of the test suite these tests belong to. Should rarely be changed for
-# Makefiles built into the FreeBSD src tree.
-TESTSUITE?= FreeBSD
-
# List of subdirectories containing tests into which to recurse. This has the
# same semantics as SUBDIR at build-time. However, the directories listed here
# get registered into the run-time test suite definitions so that the test
@@ -27,31 +19,10 @@ TESTSUITE?= FreeBSD
# SUBDIR for directories that may contain helper binaries and/or data files.
TESTS_SUBDIRS?=
-# Knob to control the handling of the Kyuafile for this Makefile.
-#
-# If 'yes', a Kyuafile exists in the source tree and is installed into
-# TESTSDIR.
-#
-# If 'auto', a Kyuafile is automatically generated based on the list of test
-# programs built by the Makefile and is installed into TESTSDIR. This is the
-# default and is sufficient in the majority of the cases.
-#
-# If 'no', no Kyuafile is installed.
-KYUAFILE?= auto
-
-# Per-test program interface definition.
-#
-# The name provided here must match one of the interface names supported by
-# Kyua as this is later encoded in the Kyuafile test program definitions.
-#TEST_INTERFACE.test-program= interface-name
-
-# Per-test program metadata properties as a list of key/value pairs.
-#
-# All the variables for a particular program are appended to the program's
-# definition in the Kyuafile. This feature can be used to avoid having to
-# explicitly supply a Kyuafile in the source directory, allowing the caller
-# Makefile to rely on the KYUAFILE=auto behavior defined here.
-#TEST_METADATA.test-program+= key=value
+# If defined, indicates that the tests built by the Makefile are not part of
+# the FreeBSD Test Suite. The implication of this is that the tests won't be
+# installed under /usr/tests/ and that Kyua won't be able to run them.
+#NOT_FOR_TEST_SUITE=
# List of variables to pass to the tests at run-time via the environment.
TESTS_ENV?=
@@ -65,13 +36,6 @@ TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/
TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib
TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g}
-# Path to the prefix of the installed Kyua CLI, if any.
-#
-# If kyua is installed from ports, we automatically define a realtest target
-# below to run the tests using this tool. The tools are searched for in the
-# hierarchy specified by this variable.
-KYUA_PREFIX?= /usr/local
-
# List of all tests being built. The various *.test.mk modules extend this
# variable as needed.
_TESTS=
@@ -95,82 +59,9 @@ WITHOUT_MAN=yes
PROG_VARS+= BINDIR
PROGS_TARGETS+= install
-.if ${KYUAFILE:tl} == yes
-FILES+=Kyuafile
-FILESDIR_Kyuafile= ${TESTSDIR}
-
-CLEANFILES+= Kyuafile.auto Kyuafile.auto.tmp
-.elif ${KYUAFILE:tl} == auto
-FILES+=Kyuafile.auto
-FILESDIR_Kyuafile.auto= ${TESTSDIR}
-FILESNAME_Kyuafile.auto= Kyuafile
-
-CLEANFILES+= Kyuafile.auto Kyuafile.auto.tmp
-
-.NOPATH: Kyuafile.auto
-Kyuafile.auto: Makefile
- @{ \
-
svn commit: r263173 - head/share/examples/tests/tests/atf
Author: jmmv Date: Fri Mar 14 12:55:06 2014 New Revision: 263173 URL: http://svnweb.freebsd.org/changeset/base/263173 Log: Remove unnecessary svn:executable property from source file. The atf cp_test.sh sample file should have never been marked executable in the first place because this file needs to be built first before being usable. Modified: Directory Properties: head/share/examples/tests/tests/atf/cp_test.sh (props changed) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263081 - head/tools/regression/usr.bin/lastcomm
Author: jmmv
Date: Wed Mar 12 10:35:22 2014
New Revision: 263081
URL: http://svnweb.freebsd.org/changeset/base/263081
Log:
Fix lastcomm tests under amd64.
Force the use of TZ=UTC and adjust data files accordingly. I have no means
to verify that the data files for the other architectures are valid.
Modified:
head/tools/regression/usr.bin/lastcomm/regress.t
head/tools/regression/usr.bin/lastcomm/v1-amd64.out
head/tools/regression/usr.bin/lastcomm/v2-amd64.out
Modified: head/tools/regression/usr.bin/lastcomm/regress.t
==
--- head/tools/regression/usr.bin/lastcomm/regress.tWed Mar 12 10:25:26
2014(r263080)
+++ head/tools/regression/usr.bin/lastcomm/regress.tWed Mar 12 10:35:22
2014(r263081)
@@ -6,6 +6,8 @@
DIR=`dirname $0`
ARCH=`uname -m`
+TZ=UTC; export TZ
+
check()
{
NUM=$1
Modified: head/tools/regression/usr.bin/lastcomm/v1-amd64.out
==
--- head/tools/regression/usr.bin/lastcomm/v1-amd64.out Wed Mar 12 10:25:26
2014(r263080)
+++ head/tools/regression/usr.bin/lastcomm/v1-amd64.out Wed Mar 12 10:35:22
2014(r263081)
@@ -1,28 +1,28 @@
-core -FDX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-core -DX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-cc - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 06:44
-ld - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-as - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-cc1 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 0.234 es Wed May 16 06:44
-diff - root 0.203 secs 0.203 us 0.000 sy 0.234 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 06:44
-dd - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 3.016 es Wed May 16 06:44
-sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 1.938 es Wed May 16 06:44
-find - root 0.250 secs 0.031 us 0.219 sy 1.938 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 3.062 es Wed May 16 06:44
-egrep - root 3.031 secs 3.031 us 0.000 sy 3.062 es Wed May 16 06:44
-time - root 0.000 secs 0.000 us 0.000 sy 0.188 es Wed May 16 06:44
-awk - root 0.172 secs 0.172 us 0.000 sy 0.188 es Wed May 16 06:44
-accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 06:44
+core -FDX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+core -DX root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+cc - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44
+ld - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+as - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+cc1 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+time -F root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 0.234 es Wed May 16 11:44
+diff - root 0.203 secs 0.203 us 0.000 sy 0.234 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 0.016 es Wed May 16 11:44
+dd - root 0.016 secs 0.000 us 0.016 sy 0.016 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 3.016 es Wed May 16 11:44
+sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 1.938 es Wed May 16 11:44
+find - root 0.250 secs 0.031 us 0.219 sy 1.938 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 3.062 es Wed May 16 11:44
+egrep - root 3.031 secs 3.031 us 0.000 sy 3.062 es Wed May 16 11:44
+time - root 0.000 secs 0.000 us 0.000 sy 0.188 es Wed May 16 11:44
+awk
svn commit: r263082 - head/tools/regression/usr.bin/make
Author: jmmv
Date: Wed Mar 12 10:38:32 2014
New Revision: 263082
URL: http://svnweb.freebsd.org/changeset/base/263082
Log:
Only run the make tests when make is fmake.
Because bmake is the default make being built, many of the tests here
fail due to differences between the two. Just skip the tests for now
when using fmake.
Modified:
head/tools/regression/usr.bin/make/common.sh
Modified: head/tools/regression/usr.bin/make/common.sh
==
--- head/tools/regression/usr.bin/make/common.shWed Mar 12 10:35:22
2014(r263081)
+++ head/tools/regression/usr.bin/make/common.shWed Mar 12 10:38:32
2014(r263082)
@@ -13,6 +13,13 @@ fatal()
exit 1
}
+make_is_fmake() {
+ # This test is not very reliable but works for now: the old fmake
+ # does have a -v option while bmake doesn't.
+ ${MAKE_PROG} -f Makefile.non-existent -v 21 | \
+ grep -q cannot open.*non-existent
+}
+
#
# Check whether the working directory exists - it must.
#
@@ -322,19 +329,25 @@ eval_compare()
while [ ${N} -le ${TEST_N} ] ; do
fail=
todo=
+ skip=
if ! skip_test ${N} ; then
do_compare stdout ${N} || fail=${fail}stdout
do_compare stderr ${N} || fail=${fail}stderr
do_compare status ${N} || fail=${fail}status
eval todo=\${TEST_${N}_TODO}
+ else
+ eval skip=\${TEST_${N}_SKIP}
fi
if [ ! -z $fail ]; then
echo -n not
fi
echo -n ok ${N} ${SUBDIR}/${N}
- if [ ! -z $fail -o ! -z $todo ]; then
+ if [ ! -z $fail -o ! -z $todo -o ! -z $skip ]; then
echo -n #
fi
+ if [ ! -z $skip ] ; then
+ echo -n skip $skip;
+ fi
if [ ! -z $todo ] ; then
echo -n TODO $todo;
fi
@@ -473,6 +486,12 @@ eval_cmd()
set -- prove
fi
+ if ! make_is_fmake ; then
+ for i in $(jot ${TEST_N:-1}) ; do
+ eval TEST_${i}_SKIP=\make is not fmake\
+ done
+ fi
+
for i
do
case $i in
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263083 - head/tools/regression/usr.sbin/sa
Author: jmmv
Date: Wed Mar 12 10:41:14 2014
New Revision: 263083
URL: http://svnweb.freebsd.org/changeset/base/263083
Log:
Fix sa tests.
Small divergences in the output padding made some sa tests fail. Just
trim all whitespace from the outputs and the golden files so comparisons
are less fragile and the tests pass again.
Modified:
head/tools/regression/usr.sbin/sa/regress.t
head/tools/regression/usr.sbin/sa/v1-amd64-sav.out
head/tools/regression/usr.sbin/sa/v1-amd64-u.out
head/tools/regression/usr.sbin/sa/v1-amd64-usr.out
head/tools/regression/usr.sbin/sa/v1-i386-sav.out
head/tools/regression/usr.sbin/sa/v1-i386-u.out
head/tools/regression/usr.sbin/sa/v1-i386-usr.out
head/tools/regression/usr.sbin/sa/v1-sparc64-sav.out
head/tools/regression/usr.sbin/sa/v1-sparc64-u.out
head/tools/regression/usr.sbin/sa/v1-sparc64-usr.out
head/tools/regression/usr.sbin/sa/v2-amd64-u.out
head/tools/regression/usr.sbin/sa/v2-i386-u.out
head/tools/regression/usr.sbin/sa/v2-sparc64-u.out
Modified: head/tools/regression/usr.sbin/sa/regress.t
==
--- head/tools/regression/usr.sbin/sa/regress.t Wed Mar 12 10:38:32 2014
(r263082)
+++ head/tools/regression/usr.sbin/sa/regress.t Wed Mar 12 10:41:14 2014
(r263083)
@@ -7,10 +7,16 @@ DIR=`dirname $0`
LCDIR=`dirname $0`/../../usr.bin/lastcomm
ARCH=`uname -m`
+collapse_whitespace()
+{
+ sed -E 's,[ ]+, ,g'
+}
+
check()
{
NUM=$1
shift
+ collapse_whitespace | \
if diff -q - $1
then
echo ok $NUM
@@ -64,7 +70,8 @@ sa -m -P $DIR/v2c-$ARCH-sav.in -U $DIR/v
cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
sa -is -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in
/dev/null
cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
-sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in
$DIR/double
+sa -s -P $DIR/v2c-$ARCH-sav.in -U $DIR/v2c-$ARCH-usr.in $DIR/v1-$ARCH-acct.in \
+| collapse_whitespace $DIR/double
cp $LCDIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in
sa -i $DIR/v1-$ARCH-acct.in $DIR/v1-$ARCH-acct.in | check 13 $DIR/double
Modified: head/tools/regression/usr.sbin/sa/v1-amd64-sav.out
==
--- head/tools/regression/usr.sbin/sa/v1-amd64-sav.out Wed Mar 12 10:38:32
2014(r263082)
+++ head/tools/regression/usr.sbin/sa/v1-amd64-sav.out Wed Mar 12 10:41:14
2014(r263083)
@@ -1,5 +1,5 @@
- 28 0.282re0.06cp 40avio 957k
- 13 0.141re0.06cp 87avio 903k ***other
- 3 0.000re0.00cp0avio0k ln
- 9 0.141re0.00cp0avio19700k time
- 3 0.000re0.00cp0avio0k time*
+ 28 0.282re 0.06cp 40avio 957k
+ 13 0.141re 0.06cp 87avio 903k ***other
+ 3 0.000re 0.00cp 0avio 0k ln
+ 9 0.141re 0.00cp 0avio 19700k time
+ 3 0.000re 0.00cp 0avio 0k time*
Modified: head/tools/regression/usr.sbin/sa/v1-amd64-u.out
==
--- head/tools/regression/usr.sbin/sa/v1-amd64-u.outWed Mar 12 10:38:32
2014(r263082)
+++ head/tools/regression/usr.sbin/sa/v1-amd64-u.outWed Mar 12 10:41:14
2014(r263083)
@@ -1,28 +1,28 @@
- 00.000 cpu0k mem0 io accton
- 00.172 cpu 41k mem0 io awk
- 00.000 cpu 140k mem0 io time
- 03.031 cpu 45k mem1 io egrep
- 00.000 cpu0k mem0 io time
- 00.250 cpu 42k mem 1087 io find
- 00.000 cpu0k mem0 io time
- 00.000 cpu0k mem0 io sleep
- 00.000 cpu 57k mem0 io time
- 00.016 cpu 31k mem 16 io dd
- 00.000 cpu0k mem0 io time
- 00.203 cpu 1976k mem0 io diff
- 00.000 cpu0k mem0 io time
- 00.000 cpu0k mem0 io ln
- 00.000 cpu0k mem0 io time*
- 00.000 cpu0k mem0 io time
- 00.000 cpu0k mem0 io ln
- 00.000 cpu0k mem0 io time*
- 00.000 cpu0k mem0 io time
- 00.000 cpu0k mem0 io ln
- 00.000 cpu0k mem0 io time*
- 00.000 cpu0k mem0 io time
- 00.000 cpu 713k mem0 io cc1
- 00.000 cpu0k mem0 io as
- 0
