Change 33189 by [EMAIL PROTECTED] on 2008/02/02 16:21:09
Integrate:
[ 32428]
Skip the udp ping tests if testing on Vista. Also, switched
the getservbyname() call to check for a udp echo port.
[ 32571]
Subject: PATCH lib/Net/Ping/t/190_alarm.t
From: "Robin Barker" <[EMAIL PROTECTED]>
Date: Tue, 4 Dec 2007 14:05:47 -0000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/lib/Net/Ping/t/190_alarm.t#3 integrate
... //depot/maint-5.8/perl/lib/Net/Ping/t/510_ping_udp.t#3 integrate
Differences ...
==== //depot/maint-5.8/perl/lib/Net/Ping/t/190_alarm.t#3 (text) ====
Index: perl/lib/Net/Ping/t/190_alarm.t
--- perl/lib/Net/Ping/t/190_alarm.t#2~18911~ 2003-03-10 23:02:41.000000000
-0800
+++ perl/lib/Net/Ping/t/190_alarm.t 2008-02-02 08:21:09.000000000 -0800
@@ -4,6 +4,12 @@
# Based on code written by [EMAIL PROTECTED] (Radu Greab).
BEGIN {
+ if ($ENV{PERL_CORE}) {
+ unless ($ENV{PERL_TEST_Net_Ping}) {
+ print "1..0 \# Skip: network dependent test\n";
+ exit;
+ }
+ }
unless (eval "require Socket") {
print "1..0 \# Skip: no Socket\n";
exit;
==== //depot/maint-5.8/perl/lib/Net/Ping/t/510_ping_udp.t#3 (text) ====
Index: perl/lib/Net/Ping/t/510_ping_udp.t
--- perl/lib/Net/Ping/t/510_ping_udp.t#2~33173~ 2008-02-01 11:33:57.000000000
-0800
+++ perl/lib/Net/Ping/t/510_ping_udp.t 2008-02-02 08:21:09.000000000 -0800
@@ -1,12 +1,24 @@
# Test to perform udp protocol testing.
+sub isWindowsVista {
+ return unless $^O eq 'MSWin32' or $^O eq "cygwin";
+ return unless eval { require Win32 };
+ return unless defined &Win32::GetOSName;
+ return Win32::GetOSName() eq "WinVista";
+}
+
BEGIN {
unless (eval "require Socket") {
print "1..0 \# Skip: no Socket\n";
exit;
}
- unless (getservbyname('echo', 'tcp')) {
- print "1..0 \# Skip: no echo port\n";
+ unless (getservbyname('echo', 'udp')) {
+ print "1..0 \# Skip: no udp echo port\n";
+ exit;
+ }
+
+ if(isWindowsVista()) {
+ print "1..0 \# Skip: udp ping blocked by Vista's default settings\n";
exit;
}
}
End of Patch.
