Module Name: src
Committed By: jmmv
Date: Mon Mar 3 19:56:32 UTC 2014
Modified Files:
src/external/bsd/atf/tests/atf/atf-sh: Makefile
Added Files:
src/external/bsd/atf/tests/atf/atf-sh: Atffile Kyuafile
Log Message:
Avoid running a helper program for atf-sh as a test.
Should fix failures observed in PR bin/48624.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-sh/Atffile \
src/external/bsd/atf/tests/atf/atf-sh/Kyuafile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/tests/atf/atf-sh/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/atf-sh/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.7 src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.8
--- src/external/bsd/atf/tests/atf/atf-sh/Makefile:1.7 Wed Feb 12 04:08:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Makefile Mon Mar 3 19:56:32 2014
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/02/12 04:08:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/03 19:56:32 jmmv Exp $
.include <bsd.init.mk>
TESTSDIR= ${TESTSBASE}/atf/atf-sh
+ATFFILE= yes
+KYUAFILE= yes
.PATH: ${SRCDIR}/atf-sh
Added files:
Index: src/external/bsd/atf/tests/atf/atf-sh/Atffile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-sh/Atffile:1.1
--- /dev/null Mon Mar 3 19:56:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Atffile Mon Mar 3 19:56:32 2014
@@ -0,0 +1,11 @@
+Content-Type: application/X-atf-atffile; version="1"
+
+prop: test-suite = "NetBSD"
+
+tp: atf-check_test
+tp: atf_check_test
+tp: config_test
+tp: integration_test
+tp: normalize_test
+tp: tc_test
+tp: tp_test
Index: src/external/bsd/atf/tests/atf/atf-sh/Kyuafile
diff -u /dev/null src/external/bsd/atf/tests/atf/atf-sh/Kyuafile:1.1
--- /dev/null Mon Mar 3 19:56:32 2014
+++ src/external/bsd/atf/tests/atf/atf-sh/Kyuafile Mon Mar 3 19:56:32 2014
@@ -0,0 +1,11 @@
+syntax(2)
+
+test_suite("NetBSD")
+
+atf_test_program{name="atf-check_test"}
+atf_test_program{name="atf_check_test"}
+atf_test_program{name="config_test"}
+atf_test_program{name="integration_test"}
+atf_test_program{name="normalize_test"}
+atf_test_program{name="tc_test"}
+atf_test_program{name="tp_test"}
