Re: Patch 14705 botched. (was Re: os2_base test failed)

Message-id: <20020619013143.GF3079@ool-18b93024.dyn.optonline.net>

p4raw-id: //depot/perl@17293

diff --git a/os2/os2_base.t b/os2/os2_base.t
index bb4735a..f65a64c 100644 (file)
--- a/os2/os2_base.t
+++ b/os2/os2_base.t
@@ -4,26 +4,22 @@ BEGIN {
     @INC = '../lib';
 }
 
-use Test::More tests => 24;
+use Test::More tests => 19;
 use strict;
 use Config;
 
 my $cwd = Cwd::sys_cwd();
-ok 1;
 ok -d $cwd;
 
 my $lpb = Cwd::extLibpath;
-ok 1;
 $lpb .= ';' unless $lpb and $lpb =~ /;$/;
 
 my $lpe = Cwd::extLibpath(1);
-ok 1;
 $lpe .= ';' unless $lpe and $lpe =~ /;$/;
 
 ok Cwd::extLibpath_set("$lpb$cwd");
 
 $lpb = Cwd::extLibpath;
-ok 1;
 $lpb =~ s#\\#/#g;
 (my $s_cwd = $cwd) =~ s#\\#/#g;
 
@@ -32,7 +28,6 @@ like($lpb, qr/\Q$s_cwd/);
 ok Cwd::extLibpath_set("$lpe$cwd", 1);
 
 $lpe = Cwd::extLibpath(1);
-ok 1;
 $lpe =~ s#\\#/#g;
 
 like($lpe, qr/\Q$s_cwd/);
@@ -48,52 +43,3 @@ like(OS2::DLLname(0), qr#^(\d+)$# );
 is(OS2::DLLname($_), OS2::DLLname($_, \&Cwd::extLibpath) ) for 0..2;
 ok(not defined eval { OS2::DLLname $_, \&Cwd::cwd; 1 } ) for 0..2;
 ok(not defined eval { OS2::DLLname $_, \&xxx; 1 } ) for 0..2;
-print "1.." . lasttest() . "\n";
-
-$cwd = Cwd::sys_cwd();
-print "ok 1\n";
-print "not " unless -d $cwd;
-print "ok 2\n";
-
-$lpb = Cwd::extLibpath;
-print "ok 3\n";
-$lpb .= ';' unless $lpb and $lpb =~ /;$/;
-
-$lpe = Cwd::extLibpath(1);
-print "ok 4\n";
-$lpe .= ';' unless $lpe and $lpe =~ /;$/;
-
-Cwd::extLibpath_set("$lpb$cwd") or print "not ";
-print "ok 5\n";
-
-$lpb = Cwd::extLibpath;
-print "ok 6\n";
-$lpb =~ s#\\#/#g;
-($s_cwd = $cwd) =~ s#\\#/#g;
-
-print "not " unless $lpb =~ /\Q$s_cwd/;
-print "ok 7\n";
-
-Cwd::extLibpath_set("$lpe$cwd", 1) or print "not ";
-print "ok 8\n";
-
-$lpe = Cwd::extLibpath(1);
-print "ok 9\n";
-$lpe =~ s#\\#/#g;
-
-print "not " unless $lpe =~ /\Q$s_cwd/;
-print "ok 10\n";
-
-unshift @INC, 'lib';
-require OS2::Process;
-my @l = OS2::Process::process_entry();
-print "not " unless @l == 11;
-print "ok 11\n";
-
-# 1: FS 2: Window-VIO 
-print "not " unless $l[9] == 1 or $l[9] == 2;
-print "ok 12\n";
-
-print "# $_\n" for @l;
-
-sub lasttest {12}