In perl.git, the branch maint-5.10 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/0579b5194ff9ef1d3d233970047bfff1b0ca1c59?hp=b2a09bc20693ac0e427f317ec90dad447407ddf9>
- Log ----------------------------------------------------------------- commit 0579b5194ff9ef1d3d233970047bfff1b0ca1c59 Author: Andy Dougherty <[email protected]> Date: Tue May 26 14:18:27 2009 -0400 Catch interdependencies for static builds too (cherry picked from commit 54f7170d626da3cbbd288fe2b7c7dbb547cb80e8) M Makefile.SH commit 6b57adc74eecaa17f5b2e359f0a3b7d55952364a Author: John E. Malmberg <[email protected]> Date: Mon May 25 23:12:28 2009 -0500 [email protected]:50:08 magic.t leaves $ENV{foo} on VMS. This patches Magic.t to remove the $ENV{foo} it created on VMS. This environment variable interferes with running other tests including CPAN tests. -John [email protected] Personal Opinion Only Signed-off-by: H.Merijn Brand <[email protected]> (cherry picked from commit 8df0e0edf4a8a108bdd1dc681d519947c09a5332) M t/op/magic.t commit 96fceec63634db73078f6fed7a6cd2979426a9c7 Author: John E. Malmberg <[email protected]> Date: Mon May 25 23:26:26 2009 -0500 [email protected]:50:08 perl5db.t leaves db.out behind on VMS This patch fixes lib/perl5db.t to not leave a db.out file behind on VMS after a test run. -John [email protected] Personal Opinion Only Signed-off-by: H.Merijn Brand <[email protected]> (cherry picked from commit 7cd487314be59fe3c6b1f2962a6a8713952980c2) M lib/perl5db.t commit 11566b874bb8c40613bf2ee611d2da126eb51eef Author: John E. Malmberg <[email protected]> Date: Mon May 25 23:47:34 2009 -0500 [email protected]:50:08 text-options.t file cleanup on VMS This patch fixes lib/Pod/text-options.t to not leave tmp.pod and out.tmp files behind on VMS. -John [email protected] Personal Opinion Only Signed-off-by: H.Merijn Brand <[email protected]> (cherry picked from commit 7dda6b54f0ff2d46d0452bb49c22a547b9639004) M lib/Pod/t/text-options.t commit 89690208e461509af166c244b479d4027921ac7c Author: Rafael Garcia-Suarez <[email protected]> Date: Mon May 25 12:51:50 2009 +0200 Don't run mro/* tests under miniperl (cherry picked from commit 751caec9e63fc638aac7e9bb9e6c7dd0835947f7) M Makefile.SH commit 09d9b1cb6d1ebd066073289476a8f51244ad0951 Author: Rafael Garcia-Suarez <[email protected]> Date: Mon May 25 12:39:27 2009 +0200 Skip tests that use attributes.pm under miniperl (cherry-picked from commit 98d0ccc7b44dcb24100a1c202a144a52a6991fe6) M t/op/attrhand.t M t/op/attrs.t commit bbf336e2cc32008186645038ae6da3c966db2966 Author: Rafael Garcia-Suarez <[email protected]> Date: Mon May 25 12:15:09 2009 +0200 Skip under miniperl (cannot load Fcntl) (cherry picked from commit 3484683b77726e6b8128b8dc67fb04d71a017464) M t/io/perlio_open.t commit b0c997d2ad3395ee37d9cc95f582350008d752ba Author: Rafael Garcia-Suarez <[email protected]> Date: Mon May 25 11:59:03 2009 +0200 Skip tests if PerlIO::scalar is not available (cherry picked from commit 0cb48d0073de16f10e39d528795df480f2e45d37) M t/io/perlio.t ----------------------------------------------------------------------- Summary of changes: Makefile.SH | 12 ++++++++++-- lib/Pod/t/text-options.t | 2 +- lib/perl5db.t | 2 +- t/io/perlio.t | 6 +++++- t/io/perlio_open.t | 10 +++++++--- t/op/attrhand.t | 4 ++++ t/op/attrs.t | 8 ++++++-- t/op/magic.t | 5 +++++ 8 files changed, 39 insertions(+), 10 deletions(-) diff --git a/Makefile.SH b/Makefile.SH index 9fe9a00..128bea8 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -206,6 +206,14 @@ static_list=' ' for f in $static_ext; do base=`echo "$f" | sed 's/.*\///'` static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)" + : Parallel makes reveal that we have some interdependencies + this_target="lib/auto/$f/$base\$(LIB_EXT)" + case $f in + Math/BigInt/FastCalc|Devel/NYTProf) extra_dep="$extra_dep +$this_target: lib/auto/List/Util/Util\$(LIB_EXT)" ;; + Unicode/Normalize) extra_dep="$extra_dep +$this_target: uni.data" ;; + esac done nonxs_list=' ' @@ -1409,7 +1417,7 @@ test.torture torturetest: test_prep minitest.utf16: minitest.prep - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ - && $(LDLIBPTH) $(RUN) ./perl TEST -minitest -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t mro/*.t </dev/tty + && $(LDLIBPTH) $(RUN) ./perl TEST -minitest -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty test.utf16 check.utf16: test_prep PERL=./perl $(MAKE) TEST_ARGS=-utf16 _test @@ -1470,7 +1478,7 @@ minitest.prep: # is crashing. minitest: miniperl$(EXE_EXT) lib/re.pm minitest.prep - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ - && $(LDLIBPTH) $(RUN) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t mro/*.t </dev/tty + && $(LDLIBPTH) $(RUN) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty # Test via harness diff --git a/lib/Pod/t/text-options.t b/lib/Pod/t/text-options.t index e2146c2..8a115d8 100644 --- a/lib/Pod/t/text-options.t +++ b/lib/Pod/t/text-options.t @@ -69,7 +69,7 @@ while (<DATA>) { $output = <TMP>; } close TMP; - unlink ('tmp.pod', 'out.tmp'); + 1 while unlink ('tmp.pod', 'out.tmp'); my $expected = ''; while (<DATA>) { last if $_ eq "###\n"; diff --git a/lib/perl5db.t b/lib/perl5db.t index fd65ef9..67b5fda 100644 --- a/lib/perl5db.t +++ b/lib/perl5db.t @@ -85,5 +85,5 @@ like($contents, qr/sub factorial/, # clean up. END { - unlink qw(.perldb db.out); + 1 while unlink qw(.perldb db.out); } diff --git a/t/io/perlio.t b/t/io/perlio.t index 3be0f6a..c145945 100644 --- a/t/io/perlio.t +++ b/t/io/perlio.t @@ -92,7 +92,11 @@ ok(close($utffh)); } # in-memory open -{ +SKIP: { + eval { require PerlIO::scalar }; + unless (find PerlIO::Layer 'scalar') { + skip("PerlIO::scalar not found", 8); + } my $var; ok( open(my $x,"+<",\$var), 'magic in-memory file via 3 arg open with \\$var'); ok( defined fileno($x), ' fileno' ); diff --git a/t/io/perlio_open.t b/t/io/perlio_open.t index 7d870b9..e8e10fb 100644 --- a/t/io/perlio_open.t +++ b/t/io/perlio_open.t @@ -1,11 +1,12 @@ #!./perl -use strict; -use warnings; - BEGIN { chdir 't' if -d 't'; @INC = '../lib'; + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # Skip: no Fcntl under miniperl\n"; + exit 0; + } unless (find PerlIO::Layer 'perlio') { print "1..0 # Skip: not perlio\n"; exit 0; @@ -17,6 +18,9 @@ BEGIN { } } +use strict; +use warnings; + use Test::More tests => 6; use Fcntl qw(:seek); diff --git a/t/op/attrhand.t b/t/op/attrhand.t index 8b11ac4..8c89f7f 100644 --- a/t/op/attrhand.t +++ b/t/op/attrhand.t @@ -1,6 +1,10 @@ #!/usr/bin/perl -w BEGIN { + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # skip: miniperl can't load attributes\n"; + exit 0; + } chdir 't' if -d 't'; @INC = '../lib'; require './test.pl'; diff --git a/t/op/attrs.t b/t/op/attrs.t index a27b61e..c9cbb31 100644 --- a/t/op/attrs.t +++ b/t/op/attrs.t @@ -2,14 +2,18 @@ # Regression tests for attributes.pm and the C< : attrs> syntax. -use warnings; - BEGIN { + if ($ENV{PERL_CORE_MINITEST}) { + print "1..0 # skip: miniperl can't load attributes\n"; + exit 0; + } chdir 't' if -d 't'; @INC = '../lib'; require './test.pl'; } +use warnings; + plan 90; $SIG{__WARN__} = sub { die @_ }; diff --git a/t/op/magic.t b/t/op/magic.t index 9389979..bfb68a7 100755 --- a/t/op/magic.t +++ b/t/op/magic.t @@ -31,6 +31,11 @@ $PERL = $ENV{PERL} $Is_MSWin32 ? '.\perl' : './perl'); +END { + # On VMS, environment variable changes are peristent after perl exits + delete $ENV{'FOO'} if $Is_VMS; +} + eval '$ENV{"FOO"} = "hi there";'; # check that ENV is inited inside eval # cmd.exe will echo 'variable=value' but 4nt will echo just the value # -- Nikola Knezevic -- Perl5 Master Repository
