[src/trunk]: src/external/bsd/atf/tests/atf/test-programs Prevent registering...

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/db15be6abdb2
branches:  trunk
changeset: 793468:db15be6abdb2
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Feb 15 04:15:20 2014 +0000

description:
Prevent registering the helper programs as test programs.

They are not intended to be run neither by atf-run nor Kyua, and doing so
results in test failures.  The easiest way to do this for now is to just
ship custom Atffile and Kyuafile files.  (This broke because with atf-0.20
we started using the auto-generated versions of these, and due to the way
bsd.test.mk works, these registered the helpers as well.)

Problem reported by martin@.

diffstat:

 external/bsd/atf/tests/atf/test-programs/Atffile  |  9 +++++++++
 external/bsd/atf/tests/atf/test-programs/Kyuafile |  9 +++++++++
 external/bsd/atf/tests/atf/test-programs/Makefile |  4 +++-
 3 files changed, 21 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r 0299415bb4ec -r db15be6abdb2 external/bsd/atf/tests/atf/test-programs/Atffile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/test-programs/Atffile  Sat Feb 15 04:15:20 2014 +0000
@@ -0,0 +1,9 @@
+Content-Type: application/X-atf-atffile; version="1"
+
+prop: test-suite = "NetBSD"
+
+tp: config_test
+tp: expect_test
+tp: meta_data_test
+tp: result_test
+tp: srcdir_test
diff -r 0299415bb4ec -r db15be6abdb2 external/bsd/atf/tests/atf/test-programs/Kyuafile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/test-programs/Kyuafile Sat Feb 15 04:15:20 2014 +0000
@@ -0,0 +1,9 @@
+syntax(2)
+
+test_suite("NetBSD")
+
+atf_test_program{name="config_test"}
+atf_test_program{name="expect_test"}
+atf_test_program{name="meta_data_test"}
+atf_test_program{name="result_test"}
+atf_test_program{name="srcdir_test"}
diff -r 0299415bb4ec -r db15be6abdb2 external/bsd/atf/tests/atf/test-programs/Makefile
--- a/external/bsd/atf/tests/atf/test-programs/Makefile Sat Feb 15 02:02:39 2014 +0000
+++ b/external/bsd/atf/tests/atf/test-programs/Makefile Sat Feb 15 04:15:20 2014 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/15 04:15:20 jmmv Exp $
 
 .include <bsd.init.mk>
 
 TESTSDIR=      ${TESTSBASE}/atf/test-programs
+ATFFILE=       yes
+KYUAFILE=      yes
 
 .PATH:         ${SRCDIR}/test-programs