X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fblib.t;h=b6df9e8d2b95b3efd46e5c56243f1c14f9045f8b;hb=c74ace89800a81a764294e9f6eacc04bbed5a568;hp=6828f8b247e9cdaf7c76ddc7795d67ac5717eda3;hpb=e69a2255d0db4d110e403864fcb97407ce8e4ff9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/blib.t b/lib/blib.t
index 6828f8b..b6df9e8 100644
--- a/lib/blib.t
+++ b/lib/blib.t
@@ -6,6 +6,7 @@ BEGIN {
 }
 
 use strict;
+use File::Spec;
 my($blib, $blib_arch, $blib_lib, @blib_dirs);
 
 sub _cleanup {
@@ -24,6 +25,7 @@ sub _mkdirs {
 BEGIN {
     if ($^O eq 'MacOS')
     {
+	$MacPerl::Architecture = $MacPerl::Architecture; # shhhhh
 	$blib = ":blib:";
 	$blib_lib = ":blib:lib:";
 	$blib_arch = ":blib:lib:$MacPerl::Architecture:";
@@ -50,13 +52,26 @@ _mkdirs( @blib_dirs );
     my $warnings = '';
     local $SIG{__WARN__} = sub { $warnings = join '', @_ };
     use_ok('blib');
-    is( $warnings, '',  'use blib is niiiice and quiet' );
+    is( $warnings, '',  'use blib is nice and quiet' );
 }
 
 is( @INC, 3, '@INC now has 3 elements' );
 is( $INC[2],    '../lib',       'blib added to the front of @INC' );
 
-ok( grep(m|$blib_lib$|, @INC[0,1])  == 1,     '  blib/lib in @INC');
-ok( grep(m|$blib_arch$|, @INC[0,1]) == 1,     '  blib/arch in @INC');
+if ($^O eq 'VMS') {
+    # Unix syntax is accepted going in but it's not what comes out
+    # So we don't use catdir above
+    $blib_arch = 'blib.arch]';
+    $blib_lib = 'blib.lib]';
+}
+elsif ($^O ne 'MacOS')
+{
+    $blib_arch = File::Spec->catdir("blib","arch");
+    $blib_lib  = File::Spec->catdir("blib","lib");
+}
+
+
+ok( grep(m|\Q$blib_lib\E$|, @INC[0,1])  == 1,     "  $blib_lib in \@INC");
+ok( grep(m|\Q$blib_arch\E$|, @INC[0,1]) == 1,     "  $blib_arch in \@INC");
 
 END { _cleanup( @blib_dirs ); }