From dbf5b53da3359b90cbae59680cfc88b60f59cfc1 Mon Sep 17 00:00:00 2001 From: jmmv Date: Tue, 19 Feb 2013 06:06:39 +0000 Subject: [PATCH] Enable the build of kyua-testers and register its files and directories. This is conditional on MKKYUA. --- distrib/sets/lists/base/mi | 4 +++- distrib/sets/lists/comp/mi | 3 ++- distrib/sets/lists/debug/mi | 19 ++++++++++++++++++- distrib/sets/lists/man/mi | 23 ++++++++++++++++++++++- distrib/sets/lists/tests/mi | 20 +++++++++++++++++++- etc/mtree/NetBSD.dist.tests | 4 +++- external/bsd/Makefile | 4 ++-- 7 files changed, 69 insertions(+), 8 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index b827e05d7607..b1cbad07cc58 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1018 2013/02/05 17:52:22 matt Exp $ +# $NetBSD: mi,v 1.1019 2013/02/19 06:06:39 jmmv Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1064,6 +1064,8 @@ ./usr/libexec/kdc base-obsolete obsolete ./usr/libexec/kfd base-obsolete obsolete ./usr/libexec/kpasswdd base-krb5-bin kerberos +./usr/libexec/kyua-atf-tester base-kyua-bin kyua +./usr/libexec/kyua-plain-tester base-kyua-bin kyua ./usr/libexec/lfs_cleanerd base-obsolete obsolete ./usr/libexec/locate.bigram base-sysutil-bin ./usr/libexec/locate.code base-sysutil-bin diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index bf9482679825..3f495592db01 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1804 2013/02/16 21:40:20 jmmv Exp $ +# $NetBSD: mi,v 1.1805 2013/02/19 06:06:39 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3185,6 +3185,7 @@ ./usr/lib/pkgconfig/atf-c.pc comp-atf-lib atf,share ./usr/lib/pkgconfig/atf-sh.pc comp-atf-lib atf,share ./usr/lib/pkgconfig/atf.pc comp-obsolete obsolete +./usr/lib/pkgconfig/kyua-testers.pc comp-kyua-lib kyua,share ./usr/lib/pkgconfig/libcrypto.pc comp-crypto-lib crypto,share ./usr/lib/pkgconfig/libssl.pc comp-crypto-lib crypto,share ./usr/lib/pkgconfig/lutok.pc comp-crypto-lib kyua,share diff --git a/distrib/sets/lists/debug/mi b/distrib/sets/lists/debug/mi index fbbc14239525..18ee10cad175 100644 --- a/distrib/sets/lists/debug/mi +++ b/distrib/sets/lists/debug/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.6 2013/02/16 21:40:38 jmmv Exp $ +# $NetBSD: mi,v 1.7 2013/02/19 06:06:42 jmmv Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/libdata/debug/bin/cat.debug comp-util-debug debug ./usr/libdata/debug/bin/chio.debug comp-util-debug debug @@ -643,6 +643,8 @@ ./usr/libdata/debug/usr/libexec/ipropd-slave.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/libexec/kadmind.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/libexec/kpasswdd.debug comp-krb5-debug kerberos,debug +./usr/libdata/debug/usr/libexec/kyua-atf-tester.debug comp-kyua-debug kyua,debug +./usr/libdata/debug/usr/libexec/kyua-plain-tester.debug comp-kyua-debug kyua,debug ./usr/libdata/debug/usr/libexec/lfs_cleanerd.debug comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/lint1.debug comp-c-debug debug ./usr/libdata/debug/usr/libexec/lint2.debug comp-c-debug debug @@ -1320,6 +1322,21 @@ ./usr/libdata/debug/usr/tests/kernel/t_ucontext.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/t_writev.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/tty/t_pr.debug tests-kernel-tests debug,atf,rump +./usr/libdata/debug/usr/tests/kyua-testers/atf_helpers.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/atf_inttest.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/atf_list_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/atf_result_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/cli_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/env_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/error_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/fs_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/plain_helpers.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/plain_inttest.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/result_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/run_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/stacktrace_helper.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/stacktrace_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-testers/text_test.debug tests-kyua-tests debug,atf,kyua ./usr/libdata/debug/usr/tests/lib/csu/h_initfini.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/csu/h_initfini1.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/csu/h_initfini2.debug tests-lib-debug debug,atf diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index f2a2211704b7..7bd1698b31ae 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1419 2013/02/03 14:51:57 jdc Exp $ +# $NetBSD: mi,v 1.1420 2013/02/19 06:06:43 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -237,6 +237,9 @@ ./usr/share/man/cat1/ksh.0 man-util-catman .cat ./usr/share/man/cat1/ktrace.0 man-debug-catman .cat ./usr/share/man/cat1/ktruss.0 man-debug-catman .cat +./usr/share/man/cat1/kyua-atf-tester.0 man-kyua-catman kyua,.cat +./usr/share/man/cat1/kyua-plain-tester.0 man-kyua-catman kyua,.cat +./usr/share/man/cat1/kyua-tester.0 man-kyua-catman kyua,.cat ./usr/share/man/cat1/lam.0 man-util-catman .cat ./usr/share/man/cat1/last.0 man-util-catman .cat ./usr/share/man/cat1/lastcomm.0 man-util-catman .cat @@ -1999,6 +2002,8 @@ ./usr/share/man/cat5/krb.extra.0 man-obsolete obsolete ./usr/share/man/cat5/krb.realms.0 man-obsolete obsolete ./usr/share/man/cat5/krb5.conf.0 man-krb5-catman kerberos,.cat +./usr/share/man/cat5/kyua-tester-list.0 man-kyua-catman kyua,.cat +./usr/share/man/cat5/kyua-tester-result.0 man-kyua-catman kyua,.cat ./usr/share/man/cat5/lastlog.0 man-sys-catman .cat ./usr/share/man/cat5/lastlogx.0 man-sys-catman .cat ./usr/share/man/cat5/ld.so.conf.0 man-sys-catman .cat @@ -2120,6 +2125,8 @@ ./usr/share/man/cat7/hier.0 man-reference-catman .cat ./usr/share/man/cat7/hostname.0 man-reference-catman .cat ./usr/share/man/cat7/intro.0 man-reference-catman .cat +./usr/share/man/cat7/kyua-atf-interface.0 man-kyua-catman kyua,.cat +./usr/share/man/cat7/kyua-plain-interface.0 man-kyua-catman kyua,.cat ./usr/share/man/cat7/lint.0 man-reference-catman .cat ./usr/share/man/cat7/mailaddr.0 man-reference-catman .cat ./usr/share/man/cat7/mandoc.0 man-obsolete obsolete @@ -3236,6 +3243,9 @@ ./usr/share/man/html1/ksh.html man-util-htmlman html ./usr/share/man/html1/ktrace.html man-debug-htmlman html ./usr/share/man/html1/ktruss.html man-debug-htmlman html +./usr/share/man/html1/kyua-atf-tester.html man-kyua-htmlman kyua,html +./usr/share/man/html1/kyua-plain-tester.html man-kyua-htmlman kyua,html +./usr/share/man/html1/kyua-tester.html man-kyua-htmlman kyua,html ./usr/share/man/html1/lam.html man-util-htmlman html ./usr/share/man/html1/last.html man-util-htmlman html ./usr/share/man/html1/lastcomm.html man-util-htmlman html @@ -4844,6 +4854,8 @@ ./usr/share/man/html5/isdnd.rates.html man-isdn-htmlman html ./usr/share/man/html5/isdnd.rc.html man-isdn-htmlman html ./usr/share/man/html5/krb5.conf.html man-krb5-htmlman kerberos,html +./usr/share/man/html5/kyua-tester-list.html man-kyua-htmlman kyua,html +./usr/share/man/html5/kyua-tester-result.html man-kyua-htmlman kyua,html ./usr/share/man/html5/lastlog.html man-sys-htmlman html ./usr/share/man/html5/lastlogx.html man-sys-htmlman html ./usr/share/man/html5/ld.so.conf.html man-sys-htmlman html @@ -4954,6 +4966,8 @@ ./usr/share/man/html7/hier.html man-reference-htmlman html ./usr/share/man/html7/hostname.html man-reference-htmlman html ./usr/share/man/html7/intro.html man-reference-htmlman html +./usr/share/man/html7/kyua-atf-interface.html man-kyua-htmlman kyua,html +./usr/share/man/html7/kyua-plain-interface.html man-kyua-htmlman kyua,html ./usr/share/man/html7/lint.html man-reference-htmlman html ./usr/share/man/html7/mailaddr.html man-reference-htmlman html ./usr/share/man/html7/mdoc.html man-groff-htmlman html,groff @@ -5873,6 +5887,9 @@ ./usr/share/man/man1/ksh.1 man-util-man .man ./usr/share/man/man1/ktrace.1 man-debug-man .man ./usr/share/man/man1/ktruss.1 man-debug-man .man +./usr/share/man/man1/kyua-atf-tester.1 man-kyua-man kyua,.man +./usr/share/man/man1/kyua-plain-tester.1 man-kyua-man kyua,.man +./usr/share/man/man1/kyua-tester.1 man-kyua-man kyua,.man ./usr/share/man/man1/lam.1 man-util-man .man ./usr/share/man/man1/last.1 man-util-man .man ./usr/share/man/man1/lastcomm.1 man-util-man .man @@ -7635,6 +7652,8 @@ ./usr/share/man/man5/krb.extra.5 man-obsolete obsolete ./usr/share/man/man5/krb.realms.5 man-obsolete obsolete ./usr/share/man/man5/krb5.conf.5 man-krb5-man kerberos,.man +./usr/share/man/man5/kyua-tester-list.5 man-kyua-man kyua,.man +./usr/share/man/man5/kyua-tester-result.5 man-kyua-man kyua,.man ./usr/share/man/man5/lastlog.5 man-sys-man .man ./usr/share/man/man5/lastlogx.5 man-sys-man .man ./usr/share/man/man5/ld.so.conf.5 man-sys-man .man @@ -7756,6 +7775,8 @@ ./usr/share/man/man7/hier.7 man-reference-man .man ./usr/share/man/man7/hostname.7 man-reference-man .man ./usr/share/man/man7/intro.7 man-reference-man .man +./usr/share/man/man7/kyua-atf-interface.7 man-kyua-man kyua,.man +./usr/share/man/man7/kyua-plain-interface.7 man-kyua-man kyua,.man ./usr/share/man/man7/lint.7 man-reference-man .man ./usr/share/man/man7/mailaddr.7 man-reference-man .man ./usr/share/man/man7/mandoc.7 man-obsolete obsolete diff --git a/distrib/sets/lists/tests/mi b/distrib/sets/lists/tests/mi index 00e6829a9dee..5782435d727e 100644 --- a/distrib/sets/lists/tests/mi +++ b/distrib/sets/lists/tests/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.519 2013/02/17 04:36:07 htodd Exp $ +# $NetBSD: mi,v 1.520 2013/02/19 06:06:44 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -56,6 +56,7 @@ ./usr/libdata/debug/usr/tests/kernel/kqueue/write tests-kernel-tests ./usr/libdata/debug/usr/tests/kernel/posix_spawn tests-kernel-tests obsolete ./usr/libdata/debug/usr/tests/kernel/tty tests-kernel-tests +./usr/libdata/debug/usr/tests/kyua-testers tests-kyua-tests ./usr/libdata/debug/usr/tests/lib tests-lib-debug ./usr/libdata/debug/usr/tests/lib/csu tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libbluetooth tests-lib-debug @@ -1502,6 +1503,23 @@ ./usr/tests/kernel/tty tests-kernel-tests ./usr/tests/kernel/tty/Atffile tests-kernel-tests atf,rump ./usr/tests/kernel/tty/t_pr tests-kernel-tests atf,rump +./usr/tests/kyua-testers tests-kyua-tests +./usr/tests/kyua-testers/Atffile tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/atf_helpers tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/atf_inttest tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/atf_list_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/atf_result_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/cli_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/env_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/error_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/fs_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/plain_helpers tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/plain_inttest tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/result_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/run_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/stacktrace_helper tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/stacktrace_test tests-kyua-tests atf,kyua +./usr/tests/kyua-testers/text_test tests-kyua-tests atf,kyua ./usr/tests/lib tests-lib-tests ./usr/tests/lib/Atffile tests-lib-tests atf ./usr/tests/lib/csu tests-lib-tests diff --git a/etc/mtree/NetBSD.dist.tests b/etc/mtree/NetBSD.dist.tests index 8fa854f5a6e6..50baa8b1ebff 100644 --- a/etc/mtree/NetBSD.dist.tests +++ b/etc/mtree/NetBSD.dist.tests @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.92 2013/02/16 21:40:44 jmmv Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.93 2013/02/19 06:06:44 jmmv Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -47,6 +47,7 @@ ./usr/libdata/debug/usr/tests/kernel/kqueue/read ./usr/libdata/debug/usr/tests/kernel/kqueue/write ./usr/libdata/debug/usr/tests/kernel/tty +./usr/libdata/debug/usr/tests/kyua-testers ./usr/libdata/debug/usr/tests/lib ./usr/libdata/debug/usr/tests/lib/csu ./usr/libdata/debug/usr/tests/lib/libbluetooth @@ -188,6 +189,7 @@ ./usr/tests/kernel/kqueue/read ./usr/tests/kernel/kqueue/write ./usr/tests/kernel/tty +./usr/tests/kyua-testers ./usr/tests/lib ./usr/tests/lib/csu ./usr/tests/lib/libbluetooth diff --git a/external/bsd/Makefile b/external/bsd/Makefile index ff8955036e1e..7c4bbcc31d6b 100644 --- a/external/bsd/Makefile +++ b/external/bsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2013/02/16 21:40:05 jmmv Exp $ +# $NetBSD: Makefile,v 1.37 2013/02/19 06:06:39 jmmv Exp $ .include @@ -20,7 +20,7 @@ SUBDIR+=ipf SUBDIR+= iscsi .endif .if (${MKKYUA} != "no") -SUBDIR+= lutok +SUBDIR+= lutok kyua-testers .endif .if (${MKLDAP} != "no") SUBDIR+= openldap