X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/8e0fc1cdff8c4d07f11a5b0bd5056e1acbe2a68a..165a9987abedd6615787c9ea9211b408fcdd9f3d:/os2/os2_base.t

diff --git a/os2/os2_base.t b/os2/os2_base.t
index bb4735a..80181b7 100644
--- 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,15 +28,21 @@ 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/);
 
-is(uc OS2::DLLname(1), uc $Config{dll_name});
-like(OS2::DLLname, qr#\Q/$Config{dll_name}\E\.dll$#i );
-(my $root_cwd = $s_cwd) =~ s,/t$,,;
-like(OS2::DLLname, qr#^\Q$root_cwd\E(/t)?\Q/$Config{dll_name}\E\.dll#i );
+if (uc OS2::DLLname() eq uc $^X) {	# Static build
+  my ($short) = ($^X =~ m,.*[/\\]([^.]+),);
+  is(uc OS2::DLLname(1), uc $short);
+  is(uc OS2::DLLname, uc $^X );		# automatically
+  is(1,1);				# automatically...
+} else {
+  is(uc OS2::DLLname(1), uc $Config{dll_name});
+  like(OS2::DLLname, qr#\Q/$Config{dll_name}\E\.dll$#i );
+  (my $root_cwd = $s_cwd) =~ s,/t$,,;
+  like(OS2::DLLname, qr#^\Q$root_cwd\E(/t)?\Q/$Config{dll_name}\E\.dll#i );
+}
 is(OS2::DLLname, OS2::DLLname(2));
 like(OS2::DLLname(0), qr#^(\d+)$# );
 
@@ -48,52 +50,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}