Module Name: src
Committed By: jmmv
Date: Sat Feb 15 04:15:20 UTC 2014
Modified Files:
src/external/bsd/atf/tests/atf/test-programs: Makefile
Added Files:
src/external/bsd/atf/tests/atf/test-programs: Atffile Kyuafile
Log Message:
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@.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/test-programs/Atffile \
src/external/bsd/atf/tests/atf/test-programs/Kyuafile
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/atf/tests/atf/test-programs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/tests/atf/test-programs/Makefile
diff -u src/external/bsd/atf/tests/atf/test-programs/Makefile:1.5 src/external/bsd/atf/tests/atf/test-programs/Makefile:1.6
--- src/external/bsd/atf/tests/atf/test-programs/Makefile:1.5 Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Makefile Sat Feb 15 04:15:20 2014
@@ -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
Added files:
Index: src/external/bsd/atf/tests/atf/test-programs/Atffile
diff -u /dev/null src/external/bsd/atf/tests/atf/test-programs/Atffile:1.1
--- /dev/null Sat Feb 15 04:15:20 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Atffile Sat Feb 15 04:15:20 2014
@@ -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
Index: src/external/bsd/atf/tests/atf/test-programs/Kyuafile
diff -u /dev/null src/external/bsd/atf/tests/atf/test-programs/Kyuafile:1.1
--- /dev/null Sat Feb 15 04:15:20 2014
+++ src/external/bsd/atf/tests/atf/test-programs/Kyuafile Sat Feb 15 04:15:20 2014
@@ -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"}
