misc tweaks

p4raw-id: //depot/perl@2393

4 files changed, 11 insertions, 3 deletions

diff --git a/ext/IO/Makefile.PL b/ext/IO/Makefile.PL
index 5366f8ea75..095d7c2b51 100644
--- a/ext/IO/Makefile.PL
+++ b/ext/IO/Makefile.PL
@@ -5,6 +5,5 @@ WriteMakefile(
 	VERSION_FROM	=> "IO.pm",
 	NAME      	=> "IO",
 	OBJECT		=> '$(O_FILES)', 
-	DEFINE		=> $define,
 	MAN3PODS	=> {},		# Pods will be built by installman.
 );
diff --git a/lib/Test.pm b/lib/Test.pm
index 22f947acf1..daf6e4e127 100644
--- a/lib/Test.pm
+++ b/lib/Test.pm
@@ -63,7 +63,7 @@ sub ok ($;$$) {
     } else {
 	$expected = to_value(shift);
 	my ($regex,$ignore);
-	if ((ref($expected)||'') eq 're') {
+	if ((ref($expected)||'') eq 'Regexp') {
 	    $ok = $result =~ /$expected/;
 	} elsif (($regex) = ($expected =~ m,^ / (.+) / $,sx) or
 	    ($ignore, $regex) = ($expected =~ m,^ m([^\w\s]) (.+) \1 $,sx)) {
@@ -96,7 +96,7 @@ sub ok ($;$$) {
 		my $prefix = "Test $ntest";
 		print $TESTOUT "# $prefix got: '$result' ($context)\n";
 		$prefix = ' ' x (length($prefix) - 5);
-		if ((ref($expected)||'') eq 're') {
+		if ((ref($expected)||'') eq 'Regexp') {
 		    $expected = 'qr/'.$expected.'/'
 		} else {
 		    $expected = "'$expected'";
diff --git a/t/lib/io_poll.t b/t/lib/io_poll.t
index d907d5414b..a0d081b034 100755
--- a/t/lib/io_poll.t
+++ b/t/lib/io_poll.t
@@ -34,6 +34,11 @@ print "ok 2\n";
 
 $poll->poll(0.1);
 
+if ($^O eq 'MSWin32') {
+print "ok 3 # skipped, doesn't work on non-socket fds\n";
+print "ok 4 # skipped, doesn't work on non-socket fds\n";
+}
+else {
 print "not "
 	unless $poll->events($stdout) == POLLOUT;
 print "ok 3\n";
@@ -41,6 +46,7 @@ print "ok 3\n";
 print "not "
 	if $poll->events($dupout);
 print "ok 4\n";
+}
 
 my @h = $poll->handles;
 print "not "
diff --git a/t/op/sort.t b/t/op/sort.t
index df8d434741..fdb4e347a5 100755
--- a/t/op/sort.t
+++ b/t/op/sort.t
@@ -2,6 +2,9 @@
 
 print "1..29\n";
 
+# XXX known to leak scalars
+$ENV{PERL_DESTRUCT_LEVEL} = 0 unless $ENV{PERL_DESTRUCT_LEVEL} > 3;
+
 sub backwards { $a lt $b ? 1 : $a gt $b ? -1 : 0 }
 
 my $upperfirst = 'A' lt 'a';