[src/trunk]: src/share/mk Simplify build of shell-based test cases: atf-compi...

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

details:   https://anonhg.NetBSD.org/src/rev/7b034810650a
branches:  trunk
changeset: 755394:7b034810650a
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Fri Jun 04 08:35:09 2010 +0000

description:
Simplify build of shell-based test cases: atf-compile is gone.

diffstat:

 share/mk/bsd.README  |   4 +---
 share/mk/bsd.own.mk  |   4 +---
 share/mk/bsd.test.mk |  17 +++++------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diffs (79 lines):

diff -r 44686c937656 -r 7b034810650a share/mk/bsd.README
--- a/share/mk/bsd.README       Fri Jun 04 08:34:35 2010 +0000
+++ b/share/mk/bsd.README       Fri Jun 04 08:35:09 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.268 2010/05/26 14:52:10 njoly Exp $
+#      $NetBSD: bsd.README,v 1.269 2010/06/04 08:35:09 jmmv Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -655,8 +655,6 @@
 
 TOOL_ASN1_COMPILE      ASN1 compiler.  [asn1_compile]
 
-TOOL_ATF_COMPILE       Generate POSIX shell test programs.  [atf-compile]
-
 TOOL_AWK               Pattern-directed scanning/processing language.  [awk]
 
 TOOL_CAP_MKDB          Create capability database.  [cap_mkdb]
diff -r 44686c937656 -r 7b034810650a share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jun 04 08:34:35 2010 +0000
+++ b/share/mk/bsd.own.mk       Fri Jun 04 08:35:09 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.627 2010/06/01 23:29:10 joerg Exp $
+#      $NetBSD: bsd.own.mk,v 1.628 2010/06/04 08:35:09 jmmv Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -227,7 +227,6 @@
 TOOL_AMIGAELF2BB=      ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-elf2bb
 TOOL_AMIGATXLT=                ${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-txlt
 TOOL_ASN1_COMPILE=     ${TOOLDIR}/bin/${_TOOL_PREFIX}asn1_compile
-TOOL_ATF_COMPILE=      ${TOOLDIR}/bin/${_TOOL_PREFIX}atf-compile
 TOOL_AWK=              ${TOOLDIR}/bin/${_TOOL_PREFIX}awk
 TOOL_CAP_MKDB=         ${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
 TOOL_CAT=              ${TOOLDIR}/bin/${_TOOL_PREFIX}cat
@@ -304,7 +303,6 @@
 TOOL_AMIGAELF2BB=      amiga-elf2bb
 TOOL_AMIGATXLT=                amiga-txlt
 TOOL_ASN1_COMPILE=     asn1_compile
-TOOL_ATF_COMPILE=      atf-compile
 TOOL_AWK=              awk
 TOOL_CAP_MKDB=         cap_mkdb
 TOOL_CAT=              cat
diff -r 44686c937656 -r 7b034810650a share/mk/bsd.test.mk
--- a/share/mk/bsd.test.mk      Fri Jun 04 08:34:35 2010 +0000
+++ b/share/mk/bsd.test.mk      Fri Jun 04 08:35:09 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.7 2008/05/01 15:36:36 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.8 2010/06/04 08:35:09 jmmv Exp $
 #
 
 .include <bsd.init.mk>
@@ -37,22 +37,15 @@
 CLEANFILES+=           ${_T} ${_T}.tmp
 
 TESTS_SH_SRC_${_T}?=   ${_T}.sh
-${_T}: ${TESTS_SH_SRC_${_T}} atf-compile-cookie
+${_T}: ${TESTS_SH_SRC_${_T}}
        ${_MKTARGET_BUILD}
-       ${TOOL_ATF_COMPILE} -o ${.TARGET}.tmp ${.ALLSRC}
+       echo '#! /usr/bin/atf-sh' >${.TARGET}.tmp
+       cat ${.ALLSRC} >>${.TARGET}.tmp
+       chmod +x ${.TARGET}.tmp
        mv ${.TARGET}.tmp ${.TARGET}
 .  endfor
 .endif
 
-CLEANFILES+= atf-compile-cookie
-.if ${USETOOLS} == "yes"
-atf-compile-cookie: ${TOOL_ATF_COMPILE}
-       touch atf-compile-cookie
-.else
-atf-compile-cookie:
-       test -f atf-compile-cookie || touch atf-compile-cookie
-.endif
-
 .if !defined(NOATFFILE)
 FILES+=                        Atffile
 FILESDIR_Atffile=      ${TESTSDIR}