X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=os2%2Fos2_base.t;h=80181b775e2b28ba2604265142cae4f02bed8c63;hb=9f20e2cfb903d33f1df637b45bc92463e8540f62;hp=f65a64c532ff3356484df77b1e1059afd5761d79;hpb=6ebe41ac4b371ed6f440022cad1f0a13ea938e37;p=p5sagit%2Fp5-mst-13.2.git diff --git a/os2/os2_base.t b/os2/os2_base.t index f65a64c..80181b7 100644 --- a/os2/os2_base.t +++ b/os2/os2_base.t @@ -32,10 +32,17 @@ $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+)$# );