Attachment 144195 Details for Bug 191052 – Fix path to atf-sh in test program

[patch] Fix path to atf-sh in test program

patch.diff (text/plain), 2.26 KB, created by Julio Merino,+1 347 694 0576,New York City on 2014-06-27 16:22:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julio Merino,+1 347 694 0576,New York City

Created: 2014-06-27 16:22:12 UTC

Size: 2.26 KB

patch

obsolete

>Index: share/mk/atf.test.mk
>===================================================================
>--- share/mk/atf.test.mk	(revision 267424)
>+++ share/mk/atf.test.mk	(working copy)
>@@ -105,7 +105,7 @@
> ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
> ${_T}: ${ATF_TESTS_SH_SRC_${_T}}
> 	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
>-	cat ${.ALLSRC} | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
>+	cat ${.ALLSRC:M*.sh} | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
> 	chmod +x ${.TARGET}.tmp
> 	mv ${.TARGET}.tmp ${.TARGET}
> .endfor
>Index: share/mk/plain.test.mk
>===================================================================
>--- share/mk/plain.test.mk	(revision 267424)
>+++ share/mk/plain.test.mk	(working copy)
>@@ -57,7 +57,7 @@
> PLAIN_TESTS_SH_SED_${_T}?= # empty
> PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh
> ${_T}: ${PLAIN_TESTS_SH_SRC_${_T}}
>-	cat ${.ALLSRC} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
>+	cat ${.ALLSRC:M*.sh} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
> 	chmod +x ${.TARGET}.tmp
> 	mv ${.TARGET}.tmp ${.TARGET}
> .endfor
>Index: share/mk/tap.test.mk
>===================================================================
>--- share/mk/tap.test.mk	(revision 267424)
>+++ share/mk/tap.test.mk	(working copy)
>@@ -66,7 +66,7 @@
> ${_T}: ${TAP_TESTS_PERL_SRC_${_T}}
> 	{ \
> 	    echo '#! ${TAP_PERL_INTERPRETER}'; \
>-	    cat ${.ALLSRC} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
>+	    cat ${.ALLSRC:M*.sh} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
> 	} >${.TARGET}.tmp
> 	chmod +x ${.TARGET}.tmp
> 	mv ${.TARGET}.tmp ${.TARGET}
>Index: libexec/atf/atf-sh/tests/Makefile
>===================================================================
>--- libexec/atf/atf-sh/tests/Makefile	(revision 267424)
>+++ libexec/atf/atf-sh/tests/Makefile	(working copy)
>@@ -10,12 +10,15 @@
> ATF_TESTS_SH+=	atf_check_test
> ATF_TESTS_SH+=	config_test
> ATF_TESTS_SH+=	integration_test
>-ATF_TESTS_SH_SED_integration_test= \
>-    -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
> ATF_TESTS_SH+=	normalize_test
> ATF_TESTS_SH+=	tc_test
> ATF_TESTS_SH+=	tp_test
> 
>+integration_test: Makefile
>+ATF_TESTS_SH_SED_integration_test= \
>+    -e 's,atf_check,PATH=/usr/libexec:$${PATH} atf_check,g' \
>+    -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
>+
> SCRIPTS+=		misc_helpers
> SCRIPTSDIR_misc_helpers=${TESTSDIR}
> CLEANFILES+=		misc_helpers misc_helpers.tmp

Actions: View | Diff

Attachments on bug 191052: 143796 | 144195