Change 30203 by [EMAIL PROTECTED] on 2007/02/10 22:04:40
Integrate:
[ 27581]
Upgrade to Time::Local 1.12
[ 27642]
Upgrade to Time::Local 1.12_01
[ 28683]
Subject: PATCH: Sync Time::Local in blead to 1.13 on CPAN
From: Dave Rolsky <[EMAIL PROTECTED]>
Date: Wed, 9 Aug 2006 04:38:28 -0500 (CDT)
Message-ID: <[EMAIL PROTECTED]>
[ 29931]
Subject: [PATCH] Time::Local patch take 2
From: Dave Rolsky <[EMAIL PROTECTED]>
Date: Mon, 22 Jan 2007 09:46:08 -0600 (CST)
Message-ID: <[EMAIL PROTECTED]>
[ 29936]
Fix to Time::Local to fix problems with leap year calculation.
[ 29937]
Change 29936 missed a ;
[ 29940]
Upgrade to Time::Local 1.16
[ 29994]
Upgrade to Time::Local 1.17
Affected files ...
... //depot/maint-5.8/perl/lib/Time/Local.pm#8 integrate
... //depot/maint-5.8/perl/lib/Time/Local.t#10 integrate
Differences ...
==== //depot/maint-5.8/perl/lib/Time/Local.pm#8 (text) ====
Index: perl/lib/Time/Local.pm
--- perl/lib/Time/Local.pm#7~24144~ 2005-04-03 08:18:11.000000000 -0700
+++ perl/lib/Time/Local.pm 2007-02-10 14:04:40.000000000 -0800
@@ -7,196 +7,188 @@
use integer;
use vars qw( $VERSION @ISA @EXPORT @EXPORT_OK );
-$VERSION = '1.11';
-$VERSION = eval $VERSION;
[EMAIL PROTECTED] = qw( Exporter );
[EMAIL PROTECTED] = qw( timegm timelocal );
[EMAIL PROTECTED] = qw( timegm_nocheck timelocal_nocheck );
+$VERSION = '1.17';
-my @MonthDays = (31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
[EMAIL PROTECTED] = qw( Exporter );
[EMAIL PROTECTED] = qw( timegm timelocal );
[EMAIL PROTECTED] = qw( timegm_nocheck timelocal_nocheck );
+
+my @MonthDays = ( 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 );
# Determine breakpoint for rolling century
-my $ThisYear = (localtime())[5];
-my $Breakpoint = ($ThisYear + 50) % 100;
-my $NextCentury = $ThisYear - $ThisYear % 100;
- $NextCentury += 100 if $Breakpoint < 50;
-my $Century = $NextCentury - 100;
-my $SecOff = 0;
+my $ThisYear = ( localtime() )[5];
+my $Breakpoint = ( $ThisYear + 50 ) % 100;
+my $NextCentury = $ThisYear - $ThisYear % 100;
+$NextCentury += 100 if $Breakpoint < 50;
+my $Century = $NextCentury - 100;
+my $SecOff = 0;
+
+my ( %Options, %Cheat );
+
+use constant SECS_PER_MINUTE => 60;
+use constant SECS_PER_HOUR => 3600;
+use constant SECS_PER_DAY => 86400;
-my (%Options, %Cheat, %Min, %Max);
-my ($MinInt, $MaxInt);
+my $MaxInt = ( ( 1 << ( 8 * $Config{intsize} - 2 ) ) -1 ) * 2 + 1;
+my $MaxDay = int( ( $MaxInt - ( SECS_PER_DAY / 2 ) ) / SECS_PER_DAY ) - 1;
-if ($^O eq 'MacOS') {
+if ( $^O eq 'MacOS' ) {
# time_t is unsigned...
- $MaxInt = (1 << (8 * $Config{intsize})) - 1;
- $MinInt = 0;
-} else {
- $MaxInt = ((1 << (8 * $Config{intsize} - 2))-1)*2 + 1;
- $MinInt = -$MaxInt - 1;
-
- # On Win32 (and others?) time_t appears to be signed, but negative
- # epochs still don't work. - XXX - this is experimental
- $MinInt = 0
- unless defined ((localtime(-1))[0]);
+ $MaxInt = ( 1 << ( 8 * $Config{intsize} ) ) - 1;
+}
+else {
+ $MaxInt = ( ( 1 << ( 8 * $Config{intsize} - 2 ) ) - 1 ) * 2 + 1;
}
-
-$Max{Day} = ($MaxInt >> 1) / 43200;
-$Min{Day} = $MinInt ? -($Max{Day} + 1) : 0;
-
-$Max{Sec} = $MaxInt - 86400 * $Max{Day};
-$Min{Sec} = $MinInt - 86400 * $Min{Day};
# Determine the EPOC day for this machine
my $Epoc = 0;
-if ($^O eq 'vos') {
-# work around posix-977 -- VOS doesn't handle dates in
-# the range 1970-1980.
- $Epoc = _daygm((0, 0, 0, 1, 0, 70, 4, 0));
-}
-elsif ($^O eq 'MacOS') {
- no integer;
-
- # MacOS time() is seconds since 1 Jan 1904, localtime
- # so we need to calculate an offset to apply later
- $Epoc = 693901;
- $SecOff = timelocal(localtime(0)) - timelocal(gmtime(0));
- $Epoc += _daygm(gmtime(0));
+if ( $^O eq 'vos' ) {
+ # work around posix-977 -- VOS doesn't handle dates in the range
+ # 1970-1980.
+ $Epoc = _daygm( 0, 0, 0, 1, 0, 70, 4, 0 );
+}
+elsif ( $^O eq 'MacOS' ) {
+ $MaxDay *=2 if $^O eq 'MacOS'; # time_t unsigned ... quick hack?
+ # MacOS time() is seconds since 1 Jan 1904, localtime
+ # so we need to calculate an offset to apply later
+ $Epoc = 693901;
+ $SecOff = timelocal( localtime(0)) - timelocal( gmtime(0) ) ;
+ $Epoc += _daygm( gmtime(0) );
}
else {
- $Epoc = _daygm(gmtime(0));
+ $Epoc = _daygm( gmtime(0) );
}
-%Cheat=(); # clear the cache as epoc has changed
+%Cheat = (); # clear the cache as epoc has changed
sub _daygm {
- $_[3] + ($Cheat{pack("ss",@_[4,5])} ||= do {
- my $month = ($_[4] + 10) % 12;
- my $year = $_[5] + 1900 - $month/10;
- 365*$year + $year/4 - $year/100 + $year/400 + ($month*306 + 5)/10 -
$Epoc
- });
-}
-
-
-sub _timegm {
- my $sec = $SecOff + $_[0] + 60 * $_[1] + 3600 * $_[2];
-
- no integer;
- $sec + 86400 * &_daygm;
+ # This is written in such a byzantine way in order to avoid
+ # lexical variables and sub calls, for speed
+ return $_[3] + (
+ $Cheat{ pack( 'ss', @_[ 4, 5 ] ) } ||= do {
+ my $month = ( $_[4] + 10 ) % 12;
+ my $year = $_[5] + 1900 - $month / 10;
+
+ ( ( 365 * $year )
+ + ( $year / 4 )
+ - ( $year / 100 )
+ + ( $year / 400 )
+ + ( ( ( $month * 306 ) + 5 ) / 10 )
+ )
+ - $Epoc;
+ }
+ );
}
+sub _timegm {
+ my $sec =
+ $SecOff + $_[0] + ( SECS_PER_MINUTE * $_[1] ) + ( SECS_PER_HOUR *
$_[2] );
-sub _zoneadjust {
- my ($day, $sec, $time) = @_;
-
- $sec = $sec + _timegm(localtime($time)) - $time;
- if ($sec >= 86400) { $day++; $sec -= 86400; }
- if ($sec < 0) { $day--; $sec += 86400; }
-
- ($day, $sec);
+ return $sec + ( SECS_PER_DAY * &_daygm );
}
-
sub timegm {
- my ($sec,$min,$hour,$mday,$month,$year) = @_;
+ my ( $sec, $min, $hour, $mday, $month, $year ) = @_;
- if ($year >= 1000) {
- $year -= 1900;
+ if ( $year >= 1000 ) {
+ $year -= 1900;
}
- elsif ($year < 100 and $year >= 0) {
- $year += ($year > $Breakpoint) ? $Century : $NextCentury;
+ elsif ( $year < 100 and $year >= 0 ) {
+ $year += ( $year > $Breakpoint ) ? $Century : $NextCentury;
}
- unless ($Options{no_range_check}) {
- if (abs($year) >= 0x7fff) {
- $year += 1900;
- croak "Cannot handle date ($sec, $min, $hour, $mday, $month,
*$year*)";
- }
-
- croak "Month '$month' out of range 0..11" if $month > 11 or $month < 0;
+ unless ( $Options{no_range_check} ) {
+ if ( abs($year) >= 0x7fff ) {
+ $year += 1900;
+ croak
+ "Cannot handle date ($sec, $min, $hour, $mday, $month,
*$year*)";
+ }
+
+ croak "Month '$month' out of range 0..11"
+ if $month > 11
+ or $month < 0;
my $md = $MonthDays[$month];
-# ++$md if $month == 1 and $year % 4 == 0 and
-# ($year % 100 != 0 or ($year + 1900) % 400 == 0);
- ++$md unless $month != 1 or $year % 4 or !($year % 400);
-
- croak "Day '$mday' out of range 1..$md" if $mday > $md or $mday <
1;
- croak "Hour '$hour' out of range 0..23" if $hour > 23 or $hour <
0;
- croak "Minute '$min' out of range 0..59" if $min > 59 or $min <
0;
- croak "Second '$sec' out of range 0..59" if $sec > 59 or $sec <
0;
+ ++$md
+ if $month == 1 && _is_leap_year( $year + 1900 );
+
+ croak "Day '$mday' out of range 1..$md" if $mday > $md or $mday < 1;
+ croak "Hour '$hour' out of range 0..23" if $hour > 23 or $hour < 0;
+ croak "Minute '$min' out of range 0..59" if $min > 59 or $min < 0;
+ croak "Second '$sec' out of range 0..59" if $sec > 59 or $sec < 0;
}
- my $days = _daygm(undef, undef, undef, $mday, $month, $year);
- my $xsec = $sec + $SecOff + 60*$min + 3600*$hour;
+ my $days = _daygm( undef, undef, undef, $mday, $month, $year );
+
+ unless ($Options{no_range_check} or abs($days) < $MaxDay) {
+ my $msg = '';
+ $msg .= "Day too big - $days > $MaxDay\n" if $days > $MaxDay;
- unless ($Options{no_range_check}
- or ($days > $Min{Day} or $days == $Min{Day} and $xsec >= $Min{Sec})
- and ($days < $Max{Day} or $days == $Max{Day} and $xsec <= $Max{Sec}))
- {
- warn "Day too small - $days > $Min{Day}\n" if $days < $Min{Day};
- warn "Day too big - $days > $Max{Day}\n" if $days > $Max{Day};
- warn "Sec too small - $days < $Min{Sec}\n" if $days < $Min{Sec};
- warn "Sec too big - $days > $Max{Sec}\n" if $days > $Max{Sec};
$year += 1900;
- croak "Cannot handle date ($sec, $min, $hour, $mday, $month, $year)";
- }
+ $msg .= "Cannot handle date ($sec, $min, $hour, $mday, $month,
$year)";
- no integer;
+ croak $msg;
+ }
- $xsec + 86400 * $days;
+ return $sec
+ + $SecOff
+ + ( SECS_PER_MINUTE * $min )
+ + ( SECS_PER_HOUR * $hour )
+ + ( SECS_PER_DAY * $days );
}
+sub _is_leap_year {
+ return 0 if $_[0] % 4;
+ return 1 if $_[0] % 100;
+ return 0 if $_[0] % 400;
+
+ return 1;
+}
sub timegm_nocheck {
local $Options{no_range_check} = 1;
- &timegm;
+ return &timegm;
}
-
sub timelocal {
- # Adjust Max/Min allowed times to fit local time zone and call timegm
- local ($Max{Day}, $Max{Sec}) = _zoneadjust($Max{Day}, $Max{Sec}, $MaxInt);
- local ($Min{Day}, $Min{Sec}) = _zoneadjust($Min{Day}, $Min{Sec}, $MinInt);
my $ref_t = &timegm;
+ my $loc_for_ref_t = _timegm( localtime($ref_t) );
- # Calculate first guess with a one-day delta to avoid localtime overflow
- my $delta = ($_[5] < 100)? 86400 : -86400;
- my $loc_t = _timegm(localtime( $ref_t + $delta )) - $delta;
-
- # Is there a timezone offset from GMT or are we done
- my $zone_off = $ref_t - $loc_t
- or return $loc_t;
-
- # This hack is needed to always pick the first matching time
- # during a DST change when time would otherwise be ambiguous
- $zone_off -= 3600 if ($delta > 0 && $ref_t >= 3600);
+ my $zone_off = $loc_for_ref_t - $ref_t
+ or return $loc_for_ref_t;
# Adjust for timezone
- $loc_t = $ref_t + $zone_off;
+ my $loc_t = $ref_t - $zone_off;
# Are we close to a DST change or are we done
- my $dst_off = $ref_t - _timegm(localtime($loc_t))
- or return $loc_t;
+ my $dst_off = $ref_t - _timegm( localtime($loc_t) );
+
+ # If this evaluates to true, it means that the value in $loc_t is
+ # the _second_ hour after a DST change where the local time moves
+ # backward.
+ if ( ! $dst_off &&
+ ( ( $ref_t - SECS_PER_HOUR ) - _timegm( localtime( $loc_t -
SECS_PER_HOUR ) ) < 0 )
+ ) {
+ return $loc_t - SECS_PER_HOUR;
+ }
# Adjust for DST change
$loc_t += $dst_off;
- return $loc_t if $dst_off >= 0;
+ return $loc_t if $dst_off > 0;
- # for a negative offset from GMT, and if the original date
- # was a non-extent gap in a forward DST jump, we should
- # now have the wrong answer - undo the DST adjust;
-
- my ($s,$m,$h) = localtime($loc_t);
+ # If the original date was a non-extent gap in a forward DST jump,
+ # we should now have the wrong answer - undo the DST adjustment
+ my ( $s, $m, $h ) = localtime($loc_t);
$loc_t -= $dst_off if $s != $_[0] || $m != $_[1] || $h != $_[2];
- $loc_t;
+ return $loc_t;
}
-
sub timelocal_nocheck {
local $Options{no_range_check} = 1;
- &timelocal;
+ return &timelocal;
}
1;
@@ -214,86 +206,91 @@
=head1 DESCRIPTION
-These routines are the inverse of built-in perl functions localtime()
-and gmtime(). They accept a date as a six-element array, and return
-the corresponding time(2) value in seconds since the system epoch
-(Midnight, January 1, 1970 GMT on Unix, for example). This value can
-be positive or negative, though POSIX only requires support for
-positive values, so dates before the system's epoch may not work on
-all operating systems.
+This module provides functions that are the inverse of built-in perl
+functions C<localtime()> and C<gmtime()>. They accept a date as a
+six-element array, and return the corresponding C<time(2)> value in
+seconds since the system epoch (Midnight, January 1, 1970 GMT on Unix,
+for example). This value can be positive or negative, though POSIX
+only requires support for positive values, so dates before the
+system's epoch may not work on all operating systems.
It is worth drawing particular attention to the expected ranges for
-the values provided. The value for the day of the month is the actual day
-(ie 1..31), while the month is the number of months since January (0..11).
-This is consistent with the values returned from localtime() and gmtime().
-
-The timelocal() and timegm() functions perform range checking on the
-input $sec, $min, $hour, $mday, and $mon values by default. If you'd
-rather they didn't, you can explicitly import the timelocal_nocheck()
-and timegm_nocheck() functions.
-
- use Time::Local 'timelocal_nocheck';
-
- {
- # The 365th day of 1999
- print scalar localtime timelocal_nocheck 0,0,0,365,0,99;
-
- # The twenty thousandth day since 1970
- print scalar localtime timelocal_nocheck 0,0,0,20000,0,70;
-
- # And even the 10,000,000th second since 1999!
- print scalar localtime timelocal_nocheck 10000000,0,0,1,0,99;
- }
-
-Your mileage may vary when trying these with minutes and hours,
-and it doesn't work at all for months.
-
-Strictly speaking, the year should also be specified in a form consistent
-with localtime(), i.e. the offset from 1900.
-In order to make the interpretation of the year easier for humans,
-however, who are more accustomed to seeing years as two-digit or four-digit
-values, the following conventions are followed:
+the values provided. The value for the day of the month is the actual
+day (ie 1..31), while the month is the number of months since January
+(0..11). This is consistent with the values returned from
+C<localtime()> and C<gmtime()>.
+
+=head1 FUNCTIONS
+
+This module exports two functions by default, C<timelocal()> and
+C<timegm()>.
+
+The C<timelocal()> and C<timegm()> functions perform range checking on
+the input $sec, $min, $hour, $mday, and $mon values by default.
+
+If you are working with data you know to be valid, you can speed your
+code up by using the "nocheck" variants, C<timelocal_nocheck()> and
+C<timegm_nocheck()>. These variants must be explicitly imported.
+
+ use Time::Local 'timelocal_nocheck';
+
+ # The 365th day of 1999
+ print scalar localtime timelocal_nocheck 0,0,0,365,0,99;
+
+If you supply data which is not valid (month 27, second 1,000) the
+results will be unpredictable (so don't do that).
+
+=head2 Year Value Interpretation
+
+Strictly speaking, the year should be specified in a form consistent
+with C<localtime()>, i.e. the offset from 1900. In order to make the
+interpretation of the year easier for humans, however, who are more
+accustomed to seeing years as two-digit or four-digit values, the
+following conventions are followed:
=over 4
=item *
Years greater than 999 are interpreted as being the actual year,
-rather than the offset from 1900. Thus, 1964 would indicate the year
+rather than the offset from 1900. Thus, 1964 would indicate the year
Martin Luther King won the Nobel prize, not the year 3864.
=item *
-Years in the range 100..999 are interpreted as offset from 1900,
-so that 112 indicates 2012. This rule also applies to years less than zero
-(but see note below regarding date range).
+Years in the range 100..999 are interpreted as offset from 1900, so
+that 112 indicates 2012. This rule also applies to years less than
+zero (but see note below regarding date range).
=item *
Years in the range 0..99 are interpreted as shorthand for years in the
-rolling "current century," defined as 50 years on either side of the current
-year. Thus, today, in 1999, 0 would refer to 2000, and 45 to 2045,
-but 55 would refer to 1955. Twenty years from now, 55 would instead refer
-to 2055. This is messy, but matches the way people currently think about
-two digit dates. Whenever possible, use an absolute four digit year instead.
+rolling "current century," defined as 50 years on either side of the
+current year. Thus, today, in 1999, 0 would refer to 2000, and 45 to
+2045, but 55 would refer to 1955. Twenty years from now, 55 would
+instead refer to 2055. This is messy, but matches the way people
+currently think about two digit dates. Whenever possible, use an
+absolute four digit year instead.
=back
-The scheme above allows interpretation of a wide range of dates, particularly
-if 4-digit years are used.
+The scheme above allows interpretation of a wide range of dates,
+particularly if 4-digit years are used.
-Please note, however, that the range of dates that can be actually be handled
-depends on the size of an integer (time_t) on a given platform.
-Currently, this is 32 bits for most systems, yielding an approximate range
-from Dec 1901 to Jan 2038.
+=head2 Limits of time_t
-Both timelocal() and timegm() croak if given dates outside the supported
-range.
+The range of dates that can be actually be handled depends on the size
+of C<time_t> (usually a signed integer) on the given
+platform. Currently, this is 32 bits for most systems, yielding an
+approximate range from Dec 1901 to Jan 2038.
+
+Both C<timelocal()> and C<timegm()> croak if given dates outside the
+supported range.
=head2 Ambiguous Local Times (DST)
Because of DST changes, there are many time zones where the same local
-time occurs for two different GMT times on the same day. For example,
+time occurs for two different GMT times on the same day. For example,
in the "Europe/Paris" time zone, the local time of 2001-10-28 02:30:00
can represent either 2001-10-28 00:30:00 GMT, B<or> 2001-10-28
01:30:00 GMT.
@@ -305,19 +302,19 @@
=head2 Non-Existent Local Times (DST)
When a DST change causes a locale clock to skip one hour forward,
-there will be an hour's worth of local times that don't exist. Again,
+there will be an hour's worth of local times that don't exist. Again,
for the "Europe/Paris" time zone, the local clock jumped from
2001-03-25 01:59:59 to 2001-03-25 03:00:00.
-If the timelocal() function is given a non-existent local time, it
+If the C<timelocal()> function is given a non-existent local time, it
will simply return an epoch value for the time one hour later.
=head2 Negative Epoch Values
-Negative epoch (time_t) values are not officially supported by the
-POSIX standards, so this module's tests do not test them. On some
-systems, they are known not to work. These include MacOS (pre-OSX)
-and Win32.
+Negative epoch (C<time_t>) values are not officially supported by the
+POSIX standards, so this module's tests do not test them. On some
+systems, they are known not to work. These include MacOS (pre-OSX) and
+Win32.
On systems which do support negative epoch values, this module should
be able to cope with dates before the start of the epoch, down the
@@ -325,31 +322,33 @@
=head1 IMPLEMENTATION
-These routines are quite efficient and yet are always guaranteed to agree
-with localtime() and gmtime(). We manage this by caching the start times
-of any months we've seen before. If we know the start time of the month,
-we can always calculate any time within the month. The start times
-are calculated using a mathematical formula. Unlike other algorithms
-that do multiple calls to gmtime().
-
-timelocal() is implemented using the same cache. We just assume that we're
-translating a GMT time, and then fudge it when we're done for the timezone
-and daylight savings arguments. Note that the timezone is evaluated for
-each date because countries occasionally change their official timezones.
-Assuming that localtime() corrects for these changes, this routine will
-also be correct.
+These routines are quite efficient and yet are always guaranteed to
+agree with C<localtime()> and C<gmtime()>. We manage this by caching
+the start times of any months we've seen before. If we know the start
+time of the month, we can always calculate any time within the month.
+The start times are calculated using a mathematical formula. Unlike
+other algorithms that do multiple calls to C<gmtime()>.
+
+The C<timelocal()> function is implemented using the same cache. We
+just assume that we're translating a GMT time, and then fudge it when
+we're done for the timezone and daylight savings arguments. Note that
+the timezone is evaluated for each date because countries occasionally
+change their official timezones. Assuming that C<localtime()> corrects
+for these changes, this routine will also be correct.
=head1 BUGS
-The whole scheme for interpreting two-digit years can be considered a bug.
+The whole scheme for interpreting two-digit years can be considered a
+bug.
=head1 SUPPORT
-Support for this module is provided via the [email protected]
-email list. See http://lists.perl.org/ for more details.
+Support for this module is provided via the [email protected] email
+list. See http://lists.perl.org/ for more details.
-Please submit bugs using the RT system at rt.cpan.org, or as a last
-resort, to the [email protected] list.
+Please submit bugs to the CPAN RT system at
+http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Time-Local or via email
+at [EMAIL PROTECTED]
=head1 AUTHOR
@@ -363,4 +362,3 @@
Rolsky, <[EMAIL PROTECTED]>.
=cut
-
==== //depot/maint-5.8/perl/lib/Time/Local.t#10 (xtext) ====
Index: perl/lib/Time/Local.t
--- perl/lib/Time/Local.t#9~29874~ 2007-01-18 08:26:05.000000000 -0800
+++ perl/lib/Time/Local.t 2007-02-10 14:04:40.000000000 -0800
@@ -9,8 +9,7 @@
use strict;
-use Config;
-use Test;
+use Test::More;
use Time::Local;
# Set up time values to test
@@ -53,14 +52,23 @@
[ 1950, 04, 12, 9, 30, 31 ],
);
+# Leap year tests
+my @years =
+ (
+ [ 1900 => 0 ],
+ [ 1947 => 0 ],
+ [ 1996 => 1 ],
+ [ 2000 => 1 ],
+ [ 2100 => 0 ],
+ );
+
# Use 3 days before the start of the epoch because with Borland on
# Win32 it will work for -3600 _if_ your time zone is +01:00 (or
# greater).
-my $neg_epoch_ok = # take into account systems with unsigned time too
- (defined ((localtime(-259200))[0]) and (localtime(-259200))[5] == 69) ? 1
: 0;
+my $neg_epoch_ok = defined ((localtime(-259200))[0]) ? 1 : 0;
# use vmsish 'time' makes for oddness around the Unix epoch
-if ($^O eq 'VMS') {
+if ($^O eq 'VMS') {
$time[0][2]++;
$neg_epoch_ok = 0; # time_t is unsigned
}
@@ -68,9 +76,10 @@
my $tests = (@time * 12);
$tests += @neg_time * 12;
$tests += @bad_time;
-$tests += 8;
+$tests += @years;
+$tests += 10;
$tests += 2 if $ENV{PERL_CORE};
-$tests += 5 if $ENV{MAINTAINER};
+$tests += 8 if $ENV{MAINTAINER};
plan tests => $tests;
@@ -79,40 +88,39 @@
$year -= 1900;
$mon--;
- if ($^O eq 'vos' && $year == 70) {
- skip(1, "skipping 1970 test on VOS.\n") for 1..6;
- } elsif ($year < 70 && ! $neg_epoch_ok) {
- skip(1, "skipping negative epoch.\n") for 1..6;
- } else {
- my $year_in = $year < 70 ? $year + 1900 : $year;
- my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
-
- my($s,$m,$h,$D,$M,$Y) = localtime($time);
-
- ok($s, $sec, 'timelocal second');
- ok($m, $min, 'timelocal minute');
- ok($h, $hour, 'timelocal hour');
- ok($D, $mday, 'timelocal day');
- ok($M, $mon, 'timelocal month');
- ok($Y, $year, 'timelocal year');
- }
-
- if ($^O eq 'vos' && $year == 70) {
- skip(1, "skipping 1970 test on VOS.\n") for 1..6;
- } elsif ($year < 70 && ! $neg_epoch_ok) {
- skip(1, "skipping negative epoch.\n") for 1..6;
- } else {
- my $year_in = $year < 70 ? $year + 1900 : $year;
- my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
-
- my($s,$m,$h,$D,$M,$Y) = gmtime($time);
-
- ok($s, $sec, 'timegm second');
- ok($m, $min, 'timegm minute');
- ok($h, $hour, 'timegm hour');
- ok($D, $mday, 'timegm day');
- ok($M, $mon, 'timegm month');
- ok($Y, $year, 'timegm year');
+ SKIP: {
+ skip '1970 test on VOS fails.', 12
+ if $^O eq 'vos' && $year == 70;
+ skip 'this platform does not support negative epochs.', 12
+ if $year < 70 && ! $neg_epoch_ok;
+
+ {
+ my $year_in = $year < 70 ? $year + 1900 : $year;
+ my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+
+ my($s,$m,$h,$D,$M,$Y) = localtime($time);
+
+ is($s, $sec, "timelocal second for @$_");
+ is($m, $min, "timelocal minute for @$_");
+ is($h, $hour, "timelocal hour for @$_");
+ is($D, $mday, "timelocal day for @$_");
+ is($M, $mon, "timelocal month for @$_");
+ is($Y, $year, "timelocal year for @$_");
+ }
+
+ {
+ my $year_in = $year < 70 ? $year + 1900 : $year;
+ my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+
+ my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+
+ is($s, $sec, "timegm second for @$_");
+ is($m, $min, "timegm minute for @$_");
+ is($h, $hour, "timegm hour for @$_");
+ is($D, $mday, "timegm day for @$_");
+ is($M, $mon, "timegm month for @$_");
+ is($Y, $year, "timegm year for @$_");
+ }
}
}
@@ -123,18 +131,20 @@
eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
- ok($@, qr/.*out of range.*/, 'invalid time caused an error');
+ like($@, qr/.*out of range.*/, 'invalid time caused an error');
}
-ok(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
- 'one hour difference between two calls to timelocal');
+{
+ is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
+ 'one hour difference between two calls to timelocal');
-ok(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
- 'one day difference between two calls to timelocal');
+ is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
+ 'one day difference between two calls to timelocal');
-# Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
-ok(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
- '60 day difference between two calls to timegm');
+ # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+ is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
+ '60 day difference between two calls to timegm');
+}
# bugid #19393
# At a DST transition, the clock skips forward, eg from 01:59:59 to
@@ -145,72 +155,95 @@
my $hour = (localtime(timelocal(0, 0, 2, 7, 3, 102)))[2];
# testers in US/Pacific should get 3,
# other testers should get 2
- ok($hour == 2 || $hour == 3, 1, 'hour should be 2 or 3');
+ ok($hour == 2 || $hour == 3, 'hour should be 2 or 3');
+}
+
+for my $p (@years) {
+ my ( $year, $is_leap_year ) = @$p;
+
+ my $string = $is_leap_year ? 'is' : 'is not';
+ is( Time::Local::_is_leap_year($year), $is_leap_year,
+ "$year $string a leap year" );
}
-if ($neg_epoch_ok) {
+SKIP:
+{
+ skip 'this platform does not support negative epochs.', 6
+ unless $neg_epoch_ok;
+
eval { timegm(0,0,0,29,1,1900) };
- ok($@, qr/Day '29' out of range 1\.\.28/);
+ like($@, qr/Day '29' out of range 1\.\.28/,
+ 'does not accept leap day in 1900');
+
+ eval { timegm(0,0,0,29,1,200) };
+ like($@, qr/Day '29' out of range 1\.\.28/,
+ 'does not accept leap day in 2100 (year passed as 200)');
+
+ eval { timegm(0,0,0,29,1,0) };
+ is($@, '', 'no error with leap day of 2000 (year passed as 0)');
eval { timegm(0,0,0,29,1,1904) };
- ok($@, '');
-} else {
- skip(1, "skipping negative epoch.\n") for 1..2;
-}
+ is($@, '', 'no error with leap day of 1904');
-# round trip was broken for edge cases
-if ($^O eq "aix" && $Config{osvers} =~ m/^4\.3\./) {
- skip( 1, "No fix expected for edge case test for $_ on AIX 4.3") for qw(
timegm timelocal );
-} else {
- ok(sprintf('%x', timegm(gmtime(0x7fffffff))), sprintf('%x', 0x7fffffff),
- '0x7fffffff round trip through gmtime then timegm');
+ eval { timegm(0,0,0,29,1,4) };
+ is($@, '', 'no error with leap day of 2004 (year passed as 4)');
- ok(sprintf('%x', timelocal(localtime(0x7fffffff))), sprintf('%x',
0x7fffffff),
- '0x7fffffff round trip through localtime then timelocal');
+ eval { timegm(0,0,0,29,1,96) };
+ is($@, '', 'no error with leap day of 1996 (year passed as 96)');
}
if ($ENV{MAINTAINER}) {
- eval { require POSIX; POSIX::tzset() };
- if ($@) {
- skip( 1, "Cannot call POSIX::tzset() on this platform\n" ) for 1..3;
- }
- else {
- local $ENV{TZ} = 'Europe/Vienna';
- POSIX::tzset();
-
- # 2001-10-28 02:30:00 - could be either summer or standard time,
- # prefer earlier of the two, in this case summer
- my $time = timelocal(0, 30, 2, 28, 9, 101);
- ok($time, 1004229000,
- 'timelocal prefers earlier epoch in the presence of a DST change');
-
- local $ENV{TZ} = 'America/Chicago';
- POSIX::tzset();
-
- # Same local time in America/Chicago. There is a transition
- # here as well.
- $time = timelocal(0, 30, 1, 28, 9, 101);
- ok($time, 1004250600,
- 'timelocal prefers earlier epoch in the presence of a DST change');
-
- $time = timelocal(0, 30, 2, 1, 3, 101);
- ok($time, 986113800,
- 'timelocal for non-existent time gives you the time one hour
later');
-
- local $ENV{TZ} = 'Australia/Sydney';
- POSIX::tzset();
-
- # 2001-03-25 02:30:00 in Australia/Sydney. This is the transition
- # _to_ summer time. The southern hemisphere transitions are
- # opposite those of the northern.
- $time = timelocal(0, 30, 2, 25, 2, 101);
- ok($time, 985447800,
- 'timelocal prefers earlier epoch in the presence of a DST change');
-
- $time = timelocal(0, 30, 2, 28, 9, 101);
- ok($time, 1004200200,
- 'timelocal for non-existent time gives you the time one hour
later');
- }
+ require POSIX;
+
+ local $ENV{TZ} = 'Europe/Vienna';
+ POSIX::tzset();
+
+ # 2001-10-28 02:30:00 - could be either summer or standard time,
+ # prefer earlier of the two, in this case summer
+ my $time = timelocal(0, 30, 2, 28, 9, 101);
+ is($time, 1004229000,
+ 'timelocal prefers earlier epoch in the presence of a DST change');
+
+ local $ENV{TZ} = 'America/Chicago';
+ POSIX::tzset();
+
+ # Same local time in America/Chicago. There is a transition here
+ # as well.
+ $time = timelocal(0, 30, 1, 28, 9, 101);
+ is($time, 1004250600,
+ 'timelocal prefers earlier epoch in the presence of a DST change');
+
+ $time = timelocal(0, 30, 2, 1, 3, 101);
+ is($time, 986113800,
+ 'timelocal for non-existent time gives you the time one hour later');
+
+ local $ENV{TZ} = 'Australia/Sydney';
+ POSIX::tzset();
+ # 2001-03-25 02:30:00 in Australia/Sydney. This is the transition
+ # _to_ summer time. The southern hemisphere transitions are
+ # opposite those of the northern.
+ $time = timelocal(0, 30, 2, 25, 2, 101);
+ is($time, 985447800,
+ 'timelocal prefers earlier epoch in the presence of a DST change');
+
+ $time = timelocal(0, 30, 2, 28, 9, 101);
+ is($time, 1004200200,
+ 'timelocal for non-existent time gives you the time one hour later');
+
+ local $ENV{TZ} = 'Europe/London';
+ POSIX::tzset();
+ $time = timelocal( localtime(1111917720) );
+ is($time, 1111917720,
+ 'timelocal for round trip bug on date of DST change for Europe/London');
+
+ # There is no 1:00 AM on this date, as it leaps forward to
+ # 2:00 on the DST change - this should return 2:00 per the
+ # docs.
+ is( ( localtime( timelocal( 0, 0, 1, 27, 2, 2005 ) ) )[2], 2,
+ 'hour is 2 when given 1:00 AM on Europe/London date change' );
+
+ is( ( localtime( timelocal( 0, 0, 2, 27, 2, 2005 ) ) )[2], 2,
+ 'hour is 2 when given 2:00 AM on Europe/London date change' );
}
if ($ENV{PERL_CORE}) {
@@ -218,9 +251,9 @@
require 'timelocal.pl';
# need to get ok() from main package
- ::ok(timegm(0,0,0,1,0,80), main::timegm(0,0,0,1,0,80),
+ ::is(timegm(0,0,0,1,0,80), main::timegm(0,0,0,1,0,80),
'timegm in timelocal.pl');
- ::ok(timelocal(1,2,3,4,5,88), main::timelocal(1,2,3,4,5,88),
+ ::is(timelocal(1,2,3,4,5,88), main::timelocal(1,2,3,4,5,88),
'timelocal in timelocal.pl');
}
End of Patch.
