[YOCTO #4292] Replace PERL_TEST_DIR with PTEST_PATH. Also add a run-ptest script and rename "tests" with "ptest" in various places.
Signed-off-by: Jesse Zhang <[email protected]> --- meta/recipes-devtools/perl/perl-5.14.3/run-ptest | 2 ++ .../perl/{perl-tests.inc => perl-ptest.inc} | 30 +++++++++++----------- meta/recipes-devtools/perl/perl_5.14.3.bb | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 meta/recipes-devtools/perl/perl-5.14.3/run-ptest rename meta/recipes-devtools/perl/{perl-tests.inc => perl-ptest.inc} (48%) diff --git a/meta/recipes-devtools/perl/perl-5.14.3/run-ptest b/meta/recipes-devtools/perl/perl-5.14.3/run-ptest new file mode 100644 index 0000000..28935e1 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/run-ptest @@ -0,0 +1,2 @@ +#!/bin/sh +cd t && ./TEST diff --git a/meta/recipes-devtools/perl/perl-tests.inc b/meta/recipes-devtools/perl/perl-ptest.inc similarity index 48% rename from meta/recipes-devtools/perl/perl-tests.inc rename to meta/recipes-devtools/perl/perl-ptest.inc index b97b467..a3b19f8 100644 --- a/meta/recipes-devtools/perl/perl-tests.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -1,19 +1,20 @@ -PACKAGES += "perl-tests" -PERL_TEST_DIR = "/opt/perl-tests" +inherit ptest -do_install_append () { - mkdir -p ${D}${PERL_TEST_DIR} - cp -pv TestInit.pm MANIFEST config.sh ${D}${PERL_TEST_DIR}/ +SRC_URI += "file://run-ptest" - tar -cf - t/ | ( cd ${D}${PERL_TEST_DIR} && tar -xf - ) - ln -sf ${bindir}/perl ${D}${PERL_TEST_DIR}/t/ - ln -sf ${libdir}/perl/${PV} ${D}${PERL_TEST_DIR}/lib +do_install_ptest () { + mkdir -p ${D}${PTEST_PATH} + cp -pv TestInit.pm MANIFEST config.sh ${D}${PTEST_PATH}/ + + tar -cf - t/ | ( cd ${D}${PTEST_PATH} && tar -xf - ) + ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/ + ln -sf ${libdir}/perl/${PV} ${D}${PTEST_PATH}/lib for dir in `find ext/ dist/ cpan/ -maxdepth 2 -type d -name t ` ; do - tar -cf - $dir | ( cd ${D}${PERL_TEST_DIR} && tar -xf - ) + tar -cf - $dir | ( cd ${D}${PTEST_PATH} && tar -xf - ) done for file in `find ext dist cpan -name \*.t -o -name \test.pl`; do - tar -cf - $file | ( cd ${D}${PERL_TEST_DIR} && tar -xf - ) + tar -cf - $file | ( cd ${D}${PTEST_PATH} && tar -xf - ) done # Tweaks to make tests pass @@ -27,10 +28,9 @@ do_install_append () { cp -pv lib/auto/XS/APItest/APItest.so ${D}${libdir}/perl/${PV}/auto/XS/APItest/ mkdir -p ${D}${libdir}/perl/${PV}/auto/XS/Typemap cp -pv lib/auto/XS/Typemap/Typemap.so ${D}${libdir}/perl/${PV}/auto/XS/Typemap/ - cp -pv cpan/Digest-MD5/README ${D}${PERL_TEST_DIR}/cpan/Digest-MD5/ - cp -pv cpan/Digest-MD5/MD5.xs ${D}${PERL_TEST_DIR}/cpan/Digest-MD5/ + cp -pv cpan/Digest-MD5/README ${D}${PTEST_PATH}/cpan/Digest-MD5/ + cp -pv cpan/Digest-MD5/MD5.xs ${D}${PTEST_PATH}/cpan/Digest-MD5/ } -FILES_${PN}-tests = "${PERL_TEST_DIR} \ - ${libdir}/perl/${PV}/AnyDBM_File.t" -RDEPENDS_${PN}-tests = "${PN}-modules ${PN}-doc ${PN}-misc" +FILES_${PN}-ptest += "${libdir}/perl/${PV}/AnyDBM_File.t" +RDEPENDS_${PN}-ptest += "${PN}-modules ${PN}-doc ${PN}-misc" diff --git a/meta/recipes-devtools/perl/perl_5.14.3.bb b/meta/recipes-devtools/perl/perl_5.14.3.bb index 72efc63..9915042 100644 --- a/meta/recipes-devtools/perl/perl_5.14.3.bb +++ b/meta/recipes-devtools/perl/perl_5.14.3.bb @@ -324,7 +324,7 @@ RPROVIDES_perl-lib = "perl-lib" require perl-rdepends_${PV}.inc require perl-rprovides.inc require perl-rprovides_${PV}.inc -include perl-tests.inc +require perl-ptest.inc SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" -- 1.7.11.7 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
