diff options
| author |   Torsten Veller <torsten@veller.net> | 2009-09-03 10:27:37 +0200 |
|---|---|---|
| committer | Torsten Veller <torsten@veller.net> | 2009-09-03 10:27:37 +0200 |
| commit | 468295adb21de6f28505d68d2289ccd345205610 (patch) | |
| tree | 65bf22f6d5c6b1ef4408745c4131688a0e95c2e8 /eclass/perl-module.eclass | |
| parent | +=Dist-Zilla-1.092450 (diff) | |
| download | perl-overlay-468295adb21de6f28505d68d2289ccd345205610.tar.gz perl-overlay-468295adb21de6f28505d68d2289ccd345205610.tar.bz2 perl-overlay-468295adb21de6f28505d68d2289ccd345205610.zip | |
Export HARNESS_OPTIONS. Don't use HARNESS_OPTIONS if TEST_VERBOSE is set. Add an old libperl+perl combo. Update perl patchset
Diffstat (limited to 'eclass/perl-module.eclass')
| -rw-r--r-- | eclass/perl-module.eclass | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index eb4fe2359..e75328d31 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -140,16 +140,14 @@ perl-module_src_compile() { # perl-module_src_test() { - MULTI=$( \ - echo -j1 $MAKEOPTS |\ - sed -n -r "s/^.*(-j|--jobs=)([0-9]+).*$/\2/p" \ - ); - einfo "Test::Harness Jobs=${MULTI}" - HARNESS_OPTIONS=j${MULTI}; if [[ ${SRC_TEST} == "do" ]] ; then + if has "${TEST_VERBOSE:-0}" 0 ; then + export HARNESS_OPTIONS=j$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" ) + einfo "Test::Harness Jobs=${HARNESS_OPTIONS}" + fi ${perlinfo_done} || perlinfo if [[ -f Build ]] ; then - ./Build test || die "test failed" + ./Build test verbose=${TEST_VERBOSE:-0} || die "test failed" elif [[ -f Makefile ]] ; then emake test TEST_VERBOSE=${TEST_VERBOSE:-0} || die "test failed" fi @@ -250,9 +248,9 @@ linkduallifescripts() { if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ; then for i in "${DUALLIFESCRIPTS[@]}" ; do alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-*" - ff=`echo "${ROOT}"/usr/share/man/man1/${i}-${PV}-${P}.1*` - ff=${ff##*.1} - alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-*" + ff=`echo "${ROOT}"/usr/share/man/man1/${i}-${PV}-${P}.1*` + ff=${ff##*.1} + alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-*" done else pushd "${D}" > /dev/null |