X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FTime%2FLocal.t;h=39c99a090bd100c2cfa8d8829f61c04210125b05;hb=07be1b83a6b2d24b492356181ddf70e1c7917ae3;hp=b2c1215ca55062f638115461e507d41cce4b18fd;hpb=5c415a7a73a5d8a3f7e2df6cfea8750870e920aa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Time/Local.t b/lib/Time/Local.t
index b2c1215..39c99a0 100755
--- a/lib/Time/Local.t
+++ b/lib/Time/Local.t
@@ -53,10 +53,13 @@ my @neg_time =
      [ 1950, 04, 12, 9, 30, 31 ],
     );
 
-my $neg_epoch_ok = defined ((localtime(-3600))[0]) ? 1 : 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 = 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
 }
@@ -64,9 +67,9 @@ if ($^O eq 'VMS') {
 my $tests = (@time * 12);
 $tests += @neg_time * 12;
 $tests += @bad_time;
-$tests += 8;
+$tests += 6;
 $tests += 2 if $ENV{PERL_CORE};
-$tests += 5 if $ENV{MAINTAINER};
+$tests += 6 if $ENV{MAINTAINER};
 
 plan tests => $tests;
 
@@ -85,12 +88,12 @@ for (@time, @neg_time) {
 
         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');
+        ok($s, $sec, "timelocal second for @$_");
+        ok($m, $min, "timelocal minute for @$_");
+        ok($h, $hour, "timelocal hour for @$_");
+        ok($D, $mday, "timelocal day for @$_");
+        ok($M, $mon, "timelocal month for @$_");
+        ok($Y, $year, "timelocal year for @$_");
     }
 
     if ($^O eq 'vos' && $year == 70) {
@@ -103,12 +106,12 @@ for (@time, @neg_time) {
 
         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');
+        ok($s, $sec, "timegm second for @$_");
+        ok($m, $min, "timegm minute for @$_");
+        ok($h, $hour, "timegm hour for @$_");
+        ok($D, $mday, "timegm day for @$_");
+        ok($M, $mon, "timegm month for @$_");
+        ok($Y, $year, "timegm year for @$_");
     }
 }
 
@@ -154,17 +157,6 @@ if ($neg_epoch_ok) {
     skip(1, "skipping negative epoch.\n") for 1..2;
 }
 
-# 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');
-
-    ok(sprintf('%x', timelocal(localtime(0x7fffffff))), sprintf('%x', 0x7fffffff),
-       '0x7fffffff round trip through localtime then timelocal');
-}
-
 if ($ENV{MAINTAINER}) {
     eval { require POSIX; POSIX::tzset() };
     if ($@) {
@@ -206,6 +198,12 @@ if ($ENV{MAINTAINER}) {
         $time = timelocal(0, 30, 2, 28, 9, 101);
         ok($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) );
+        ok($time, 1111917720,
+           'timelocal for round trip bug on date of DST change for Europe/London');
     }
 }