diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-12-22 13:46:06 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-12-22 13:46:06 +0000 |
| commit | 271dc9c5821d05c454936a0b8acad5aa0a09c8a7 (patch) | |
| tree | 413735d2620de1db932a25a20675bf6720cbfacf | |
| parent | 7bede9180dba30806d01e619a26140028143ee06 (diff) | |
use Time::HiRes whenever available, independently of perl version
| -rw-r--r-- | tests/ftpserver.pl | 7 | ||||
| -rwxr-xr-x | tests/runtests.pl | 13 |
2 files changed, 12 insertions, 8 deletions
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index cb60172e0..0f5aa55fb 100644 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -44,7 +44,9 @@ require "getpart.pm"; require "ftp.pm"; BEGIN { - if($] >= 5.007003) { + # sub second timestamping needs Time::HiRes + eval { + no warnings "all"; require Time::HiRes; import Time::HiRes qw( gettimeofday ); } @@ -141,7 +143,8 @@ sub getlogfilename { # sub logmsg { my $now; - if($] >= 5.007003) { + # sub second timestamping needs Time::HiRes + if($Time::HiRes::VERSION) { my ($seconds, $usec) = gettimeofday(); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($seconds); diff --git a/tests/runtests.pl b/tests/runtests.pl index f04a4c870..536f604f8 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -58,8 +58,9 @@ BEGIN { @INC=(@INC, $ENV{'srcdir'}, "."); - # run time statistics needs perl 5.7 or newer - if($] >= 5.007003) { + # run time statistics needs Time::HiRes + eval { + no warnings "all"; require Time::HiRes; import Time::HiRes qw( time ); } @@ -3080,8 +3081,8 @@ while(@ARGV) { $keepoutfiles=1; } elsif($ARGV[0] eq "-r") { - # run time statistics needs perl 5.7 or newer - if($] >= 5.007003) { + # run time statistics needs Time::HiRes + if($Time::HiRes::VERSION) { keys(%timeprepini) = 1000; keys(%timesrvrini) = 1000; keys(%timesrvrend) = 1000; @@ -3094,8 +3095,8 @@ while(@ARGV) { } } elsif($ARGV[0] eq "-rf") { - # run time statistics needs perl 5.7 or newer - if($] >= 5.007003) { + # run time statistics needs Time::HiRes + if($Time::HiRes::VERSION) { keys(%timeprepini) = 1000; keys(%timesrvrini) = 1000; keys(%timesrvrend) = 1000; |