diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/cran.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/perl5.mk | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk index dd600640933..20f16a0500e 100644 --- a/Mk/Uses/cran.mk +++ b/Mk/Uses/cran.mk @@ -41,14 +41,14 @@ WRKSRC?= ${WRKDIR}/${PORTNAME} NO_BUILD= yes R_COMMAND= ${LOCALBASE}/bin/R -.if !target(regression-test) +.if !target(do-test) R_POSTCMD_CHECK_OPTIONS?= --timings .if !exists(${LOCALBASE}/bin/pdflatex) R_POSTCMD_CHECK_OPTIONS+= --no-manual --no-rebuild-vignettes .endif -regression-test: build +do-test: @cd ${WRKDIR} ; ${SETENV} ${MAKE_ENV} _R_CHECK_FORCE_SUGGESTS_=FALSE \ ${R_COMMAND} ${R_PRECMD_CHECK_OPTIONS} CMD check \ ${R_POSTCMD_CHECK_OPTIONS} ${PORTNAME} diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index 818954fb2c2..58201234d71 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -308,19 +308,14 @@ fix-perl-things: @${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod* || : @${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} 2>/dev/null || : -.if !target(regression-test) -TEST_ARGS?= ${MAKE_ARGS} -TEST_ENV?= ${MAKE_ENV} +.if !target(do-test) TEST_TARGET?= test TEST_WRKSRC?= ${BUILD_WRKSRC} -.if !target(test) -test: regression-test -.endif # test -regression-test: build +do-test: .if ${USE_PERL5:Mmodbuild*} - -cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS} + cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${PERL5} ${PL_BUILD} ${TEST_TARGET} ${TEST_ARGS} .elif ${USE_PERL5:Mconfigure} - -cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET} + cd ${TEST_WRKSRC}/ && ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${TEST_ARGS} ${TEST_TARGET} .endif # USE_PERL5:Mmodbuild* .endif # regression-test .endif # defined(_POSTMKINCLUDED) |