In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f507d6f025503d42282fe562873d505fd9969d0d?hp=1275ac73774e6ff47bea052db1ae6f48b7797a4f>
- Log ----------------------------------------------------------------- commit f507d6f025503d42282fe562873d505fd9969d0d Author: Nicholas Clark <[email protected]> Date: Wed Jun 30 20:30:14 2010 +0100 Convert Fcntl and PerlIO::encoding's tests to Test::More. Remove one vestigial mention of MacOS. M ext/Fcntl/t/mode.t M ext/PerlIO-encoding/t/fallback.t commit 849ddec1b3fbb2910a27e5e65275b3164d60285c Author: Nicholas Clark <[email protected]> Date: Wed Jun 30 19:58:53 2010 +0100 Convert POSIX's test to Test::More. M ext/POSIX/t/is.t M ext/POSIX/t/posix.t ----------------------------------------------------------------------- Summary of changes: ext/Fcntl/t/mode.t | 6 +----- ext/POSIX/t/is.t | 2 +- ext/POSIX/t/posix.t | 8 ++++++-- ext/PerlIO-encoding/t/fallback.t | 4 +--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ext/Fcntl/t/mode.t b/ext/Fcntl/t/mode.t index 57bd0c4..3114a0b 100644 --- a/ext/Fcntl/t/mode.t +++ b/ext/Fcntl/t/mode.t @@ -1,10 +1,6 @@ #!./perl -w -BEGIN { - require 'test.pl'; -} - -plan tests => 2; +use Test::More tests => 2; use File::Temp; use Fcntl qw(:mode); diff --git a/ext/POSIX/t/is.t b/ext/POSIX/t/is.t index cb36fb5..a0f5a45 100644 --- a/ext/POSIX/t/is.t +++ b/ext/POSIX/t/is.t @@ -70,7 +70,7 @@ foreach my $s (keys %classes) { # Expected number of tests is one each for every combination of a # known is<xxx> function and string listed above. -require '../../t/test.pl'; +use Test::More; plan(tests => keys(%classes) * keys(%functions)); diff --git a/ext/POSIX/t/posix.t b/ext/POSIX/t/posix.t index 0800f91..32382e8 100644 --- a/ext/POSIX/t/posix.t +++ b/ext/POSIX/t/posix.t @@ -8,13 +8,17 @@ BEGIN { } } -BEGIN { require "../../t/test.pl"; } -plan(tests => 66); +use Test::More tests => 66; use POSIX qw(fcntl_h signal_h limits_h _exit getcwd open read strftime write errno); use strict 'subs'; +sub next_test { + my $builder = Test::More->builder; + $builder->current_test($builder->current_test() + 1); +} + $| = 1; $Is_W32 = $^O eq 'MSWin32'; diff --git a/ext/PerlIO-encoding/t/fallback.t b/ext/PerlIO-encoding/t/fallback.t index 17ac8b1..3944f7d 100644 --- a/ext/PerlIO-encoding/t/fallback.t +++ b/ext/PerlIO-encoding/t/fallback.t @@ -1,8 +1,6 @@ #!./perl BEGIN { - push @INC, "::lib:$MacPerl::Architecture:" if $^O eq 'MacOS'; - require "../../t/test.pl"; skip_all("No perlio") unless (find PerlIO::Layer 'perlio'); if (ord("A") == 193) { print "1..0 # Skip: EBCDIC\n"; @@ -12,7 +10,7 @@ BEGIN { print "1..0 # Skip: No Encode\n"; exit 0; } - plan (9); + use Test::More tests => 9; import Encode qw(:fallback_all); } -- Perl5 Master Repository
