[inseparable changes from patch from perl5.003_15 to perl5.003_16]

[p5sagit/p5-mst-13.2.git] / t / op / time.t

diff --git a/t/op/time.t b/t/op/time.t
old mode 100644 (file)
new mode 100755 (executable)
index 2863521..1bec442
--- a/t/op/time.t
+++ b/t/op/time.t
@@ -1,20 +1,22 @@
 #!./perl
 
-# $Header: time.t,v 4.0 91/03/20 01:55:09 lwall Locked $
+# $RCSfile: time.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:32 $
 
-print "1..5\n";
+if ($does_gmtime = gmtime(time)) { print "1..5\n" }
+else { print "1..3\n" }
 
 ($beguser,$begsys) = times;
 
 $beg = time;
 
-while (($now = time) == $beg) {}
+while (($now = time) == $beg) { sleep 1 }
 
 if ($now > $beg && $now - $beg < 10){print "ok 1\n";} else {print "not ok 1\n";}
 
 for ($i = 0; $i < 100000; $i++) {
     ($nowuser, $nowsys) = times;
-    $i = 200000 if $nowuser > $beguser && $nowsys > $begsys;
+    $i = 200000 if $nowuser > $beguser && ( $nowsys > $begsys || 
+                                            (!$nowsys && !$begsys));
     last if time - $beg > 20;
 }
 
@@ -29,6 +31,8 @@ if ($sec != $xsec && $mday && $year)
 else
     {print "not ok 3\n";}
 
+exit 0 unless $does_gmtime;
+
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime($beg);
 ($xsec,$foo) = localtime($now);
 
@@ -37,7 +41,7 @@ if ($sec != $xsec && $mday && $year)
 else
     {print "not ok 4\n";}
 
-if (index(" :0:1:-1:365:366:-365:-366:",':' . ($localyday - $yday) . ':') > 0)
+if (index(" :0:1:-1:364:365:-364:-365:",':' . ($localyday - $yday) . ':') > 0)
     {print "ok 5\n";}
 else
     {print "not ok 5\n";}