X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=os2%2Fos2_base.t;h=80181b775e2b28ba2604265142cae4f02bed8c63;hb=ff920335f21fa0dd5c981a4f17dee5ac5ad41b6b;hp=ceaeb3f9ebc13c438a13887f3f44bacee3c8bd74;hpb=35bc1fdc44cabda9b94bf3b2cbffe0be67fef25d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/os2/os2_base.t b/os2/os2_base.t
index ceaeb3f..80181b7 100644
--- a/os2/os2_base.t
+++ b/os2/os2_base.t
@@ -1,49 +1,52 @@
-print "1.." . lasttest() . "\n";
+#!/usr/bin/perl -w
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
 
-$cwd = Cwd::sys_cwd();
-print "ok 1\n";
-print "not " unless -d $cwd;
-print "ok 2\n";
+use Test::More tests => 19;
+use strict;
+use Config;
 
-$lpb = Cwd::extLibpath;
-print "ok 3\n";
+my $cwd = Cwd::sys_cwd();
+ok -d $cwd;
+
+my $lpb = Cwd::extLibpath;
 $lpb .= ';' unless $lpb and $lpb =~ /;$/;
 
-$lpe = Cwd::extLibpath(1);
-print "ok 4\n";
+my $lpe = Cwd::extLibpath(1);
 $lpe .= ';' unless $lpe and $lpe =~ /;$/;
 
-Cwd::extLibpath_set("$lpb$cwd") or print "not ";
-print "ok 5\n";
+ok Cwd::extLibpath_set("$lpb$cwd");
 
 $lpb = Cwd::extLibpath;
-print "ok 6\n";
 $lpb =~ s#\\#/#g;
-($s_cwd = $cwd) =~ s#\\#/#g;
+(my $s_cwd = $cwd) =~ s#\\#/#g;
 
-print "not " unless $lpb =~ /\Q$s_cwd/;
-print "ok 7\n";
+like($lpb, qr/\Q$s_cwd/);
 
-Cwd::extLibpath_set("$lpe$cwd", 1) or print "not ";
-print "ok 8\n";
+ok Cwd::extLibpath_set("$lpe$cwd", 1);
 
 $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;
-@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}
+like($lpe, qr/\Q$s_cwd/);
+
+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+)$# );
+
+
+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;