[src/trunk]: src/external/bsd/atf/tests/atf/tools Prevent registering the hel...

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

details:   https://anonhg.NetBSD.org/src/rev/f450c367417b
branches:  trunk
changeset: 326740:f450c367417b
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sat Feb 15 19:33:54 2014 +0000

description:
Prevent registering the helper programs as test programs.

Same trick as with atf/test-programs: provide hand-generated Atffile and
Kyuafile files so that the helpers that we build as test programs do not
end up in them.

Reported by gson@.

diffstat:

 external/bsd/atf/tests/atf/tools/Atffile  |  25 +++++++++++++++++++++++++
 external/bsd/atf/tests/atf/tools/Kyuafile |  25 +++++++++++++++++++++++++
 external/bsd/atf/tests/atf/tools/Makefile |   4 +++-
 3 files changed, 53 insertions(+), 1 deletions(-)

diffs (75 lines):

diff -r a597b1dd12a9 -r f450c367417b external/bsd/atf/tests/atf/tools/Atffile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/tools/Atffile  Sat Feb 15 19:33:54 2014 +0000
@@ -0,0 +1,25 @@
+Content-Type: application/X-atf-atffile; version="1"
+
+prop: test-suite = "NetBSD"
+
+tp: application_test
+tp: atffile_test
+tp: auto_array_test
+tp: config_file_test
+tp: config_test
+tp: env_test
+tp: expand_test
+tp: fs_test
+tp: io_test
+tp: parser_test
+tp: process_test
+tp: reader_test
+tp: requirements_test
+tp: signals_test
+tp: test_program_test
+tp: text_test
+tp: ui_test
+tp: user_test
+tp: atf-config_test
+tp: atf-report_test
+tp: atf-run_test
diff -r a597b1dd12a9 -r f450c367417b external/bsd/atf/tests/atf/tools/Kyuafile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/atf/tests/atf/tools/Kyuafile Sat Feb 15 19:33:54 2014 +0000
@@ -0,0 +1,25 @@
+syntax(2)
+
+test_suite("NetBSD")
+
+atf_test_program{name="application_test"}
+atf_test_program{name="atffile_test"}
+atf_test_program{name="auto_array_test"}
+atf_test_program{name="config_file_test"}
+atf_test_program{name="config_test"}
+atf_test_program{name="env_test"}
+atf_test_program{name="expand_test"}
+atf_test_program{name="fs_test"}
+atf_test_program{name="io_test"}
+atf_test_program{name="parser_test"}
+atf_test_program{name="process_test"}
+atf_test_program{name="reader_test"}
+atf_test_program{name="requirements_test"}
+atf_test_program{name="signals_test"}
+atf_test_program{name="test_program_test"}
+atf_test_program{name="text_test"}
+atf_test_program{name="ui_test"}
+atf_test_program{name="user_test"}
+atf_test_program{name="atf-config_test"}
+atf_test_program{name="atf-report_test"}
+atf_test_program{name="atf-run_test"}
diff -r a597b1dd12a9 -r f450c367417b external/bsd/atf/tests/atf/tools/Makefile
--- a/external/bsd/atf/tests/atf/tools/Makefile Sat Feb 15 18:55:30 2014 +0000
+++ b/external/bsd/atf/tests/atf/tools/Makefile Sat Feb 15 19:33:54 2014 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2014/02/15 19:33:54 jmmv Exp $
 
 USE_ATF_LIBTOOLS=      yes
 
 .include <bsd.init.mk>
 
 TESTSDIR=      ${TESTSBASE}/atf/tools
+ATFFILE=       no
+KYUAFILE=      no
 
 .PATH:         ${SRCDIR}/tools