View | Details | Raw Unified | Return to bug 191052
Collapse All | Expand All

(-)share/mk/atf.test.mk (-1 / +1 lines)
Lines 105-111 Link Here
105 
ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
 105 
ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
106 
${_T}: ${ATF_TESTS_SH_SRC_${_T}}
 106 
${_T}: ${ATF_TESTS_SH_SRC_${_T}}
107 
	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
 107 
	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
108 
	cat ${.ALLSRC} | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
 108 
	cat ${.ALLSRC:M*.sh} | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
109 
	chmod +x ${.TARGET}.tmp
 109 
	chmod +x ${.TARGET}.tmp
110 
	mv ${.TARGET}.tmp ${.TARGET}
 110 
	mv ${.TARGET}.tmp ${.TARGET}
111 
.endfor
 111 
.endfor
(-)share/mk/plain.test.mk (-1 / +1 lines)
Lines 57-63 Link Here
57 
PLAIN_TESTS_SH_SED_${_T}?= # empty
 57 
PLAIN_TESTS_SH_SED_${_T}?= # empty
58 
PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh
 58 
PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh
59 
${_T}: ${PLAIN_TESTS_SH_SRC_${_T}}
 59 
${_T}: ${PLAIN_TESTS_SH_SRC_${_T}}
60 
	cat ${.ALLSRC} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
 60 
	cat ${.ALLSRC:M*.sh} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
61 
	chmod +x ${.TARGET}.tmp
 61 
	chmod +x ${.TARGET}.tmp
62 
	mv ${.TARGET}.tmp ${.TARGET}
 62 
	mv ${.TARGET}.tmp ${.TARGET}
63 
.endfor
 63 
.endfor
(-)share/mk/tap.test.mk (-1 / +1 lines)
Lines 66-72 Link Here
66 
${_T}: ${TAP_TESTS_PERL_SRC_${_T}}
 66 
${_T}: ${TAP_TESTS_PERL_SRC_${_T}}
67 
	{ \
 67 
	{ \
68 
	    echo '#! ${TAP_PERL_INTERPRETER}'; \
 68 
	    echo '#! ${TAP_PERL_INTERPRETER}'; \
69 
	    cat ${.ALLSRC} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
 69 
	    cat ${.ALLSRC:M*.sh} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
70 
	} >${.TARGET}.tmp
 70 
	} >${.TARGET}.tmp
71 
	chmod +x ${.TARGET}.tmp
 71 
	chmod +x ${.TARGET}.tmp
72 
	mv ${.TARGET}.tmp ${.TARGET}
 72 
	mv ${.TARGET}.tmp ${.TARGET}
(-)libexec/atf/atf-sh/tests/Makefile (-2 / +5 lines)
Lines 10-21 Link Here
10 
ATF_TESTS_SH+=	atf_check_test
 10 
ATF_TESTS_SH+=	atf_check_test
11 
ATF_TESTS_SH+=	config_test
 11 
ATF_TESTS_SH+=	config_test
12 
ATF_TESTS_SH+=	integration_test
 12 
ATF_TESTS_SH+=	integration_test
13 
ATF_TESTS_SH_SED_integration_test= \
14 
    -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
15 
ATF_TESTS_SH+=	normalize_test
 13 
ATF_TESTS_SH+=	normalize_test
16 
ATF_TESTS_SH+=	tc_test
 14 
ATF_TESTS_SH+=	tc_test
17 
ATF_TESTS_SH+=	tp_test
 15 
ATF_TESTS_SH+=	tp_test
18 

          16
          

        

            

              
              
              17
              
integration_test: Makefile

            

            

              18
              
ATF_TESTS_SH_SED_integration_test= \

            

            

              19
              
    -e 's,atf_check,PATH=/usr/libexec:$${PATH} atf_check,g' \

            

            

              20
              
    -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'

            

            

              21
              

            

        

          19
          
SCRIPTS+=		misc_helpers

          22
          
SCRIPTS+=		misc_helpers

        

        

          20
          
SCRIPTSDIR_misc_helpers=${TESTSDIR}

          23
          
SCRIPTSDIR_misc_helpers=${TESTSDIR}

        

        

          21
          
CLEANFILES+=		misc_helpers misc_helpers.tmp

          24
          
CLEANFILES+=		misc_helpers misc_helpers.tmp

        






  

  Return to bug 191052