X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fop%2Ftime.t;h=2105e9dc41551f136f745c7adbaa86f32e143b90;hb=8a064bd6d0d7a44f3e80bed959e1dc566b57850d;hp=658f9f35b921ee0c666e2ba4656c5c27f7b17fcb;hpb=f5a29b03d6424b21aad3d841127a2c7b87eb6888;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/t/op/time.t b/t/op/time.t
index 658f9f3..2105e9d 100755
--- a/t/op/time.t
+++ b/t/op/time.t
@@ -2,8 +2,27 @@
 
 # $RCSfile: time.t,v $$Revision: 4.1 $$Date: 92/08/07 18:28:32 $
 
-if ($does_gmtime = gmtime(time)) { print "1..6\n" }
-else { print "1..3\n" }
+if ( $does_gmtime = gmtime(time) ) { 
+    print "1..7\n" 
+}
+else { 
+    print "1..4\n" 
+}
+
+
+my $test = 1;
+sub ok ($$) {
+    my($ok, $name) = @_;
+
+    # You have to do it this way or VMS will get confused.
+    print $ok ? "ok $test - $name\n" : "not ok $test - $name\n";
+
+    printf "# Failed test at line %d\n", (caller)[2] unless $ok;
+
+    $test++;
+    return $ok;
+}
+
 
 ($beguser,$begsys) = times;
 
@@ -11,43 +30,46 @@ $beg = time;
 
 while (($now = time) == $beg) { sleep 1 }
 
-if ($now > $beg && $now - $beg < 10){print "ok 1\n";} else {print "not ok 1\n";}
+ok($now > $beg && $now - $beg < 10,             'very basic time test');
 
-for ($i = 0; $i < 100000; $i++) {
+for ($i = 0; $i < 1_000_000; $i++) {
     ($nowuser, $nowsys) = times;
-    $i = 200000 if $nowuser > $beguser && ( $nowsys > $begsys || 
+    $i = 2_000_000 if $nowuser > $beguser && ( $nowsys >= $begsys ||
                                             (!$nowsys && !$begsys));
     last if time - $beg > 20;
 }
 
-if ($i >= 200000) {print "ok 2\n";} else {print "not ok 2\n";}
+ok($i >= 2_000_000, 'very basic times test');
 
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($beg);
 ($xsec,$foo) = localtime($now);
 $localyday = $yday;
 
-if ($sec != $xsec && $mday && $year)
-    {print "ok 3\n";}
-else
-    {print "not ok 3\n";}
+ok($sec != $xsec && $mday && $year,             'localtime() list context');
+
+ok(localtime() =~ /^(Sun|Mon|Tue|Wed|Thu|Fri|Sat)[ ]
+                    (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]
+                    ([ \d]\d)\ (\d\d):(\d\d):(\d\d)\ (\d{4})$
+                  /x,
+   'localtime(), scalar context'
+  );
 
 exit 0 unless $does_gmtime;
 
 ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime($beg);
 ($xsec,$foo) = localtime($now);
 
-if ($sec != $xsec && $mday && $year)
-    {print "ok 4\n";}
-else
-    {print "not ok 4\n";}
+ok($sec != $xsec && $mday && $year,             'gmtime() list context');
+
+my $day_diff = $localyday - $yday;
+ok( grep({ $day_diff == $_ } (0, 1, -1, 364, 365, -364, -365)),
+                     'gmtime() and localtime() agree what day of year');
 
-if (index(" :0:1:-1:364:365:-364:-365:",':' . ($localyday - $yday) . ':') > 0)
-    {print "ok 5\n";}
-else
-    {print "not ok 5\n";}
 
 # This could be stricter.
-if (gmtime() =~ /^(Sun|Mon|Tue|Wed|Thu|Fri|Sat) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Nov|Dec) ([ \d]\d) (\d\d):(\d\d):(\d\d) (\d\d\d\d)$/)
-    {print "ok 6\n";}
-else
-    {print "not ok 6\n";}
+ok(gmtime() =~ /^(Sun|Mon|Tue|Wed|Thu|Fri|Sat)[ ]
+                 (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]
+                 ([ \d]\d)\ (\d\d):(\d\d):(\d\d)\ (\d{4})$
+               /x,
+   'gmtime(), scalar context'
+  );