X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstackable.t;h=c3b25b1c2830df8fb23192946e9d00de02161d29;hb=663a867559c7781df1c6810ec07aa4a3bd3c58ce;hp=6029a3a27297a681a0cfb02a8d766bb8cb489f24;hpb=c1ed5f4bf162501712d308bde66c8cb1d162ddc2;p=p5sagit%2Flocal-lib.git

diff --git a/t/stackable.t b/t/stackable.t
index 6029a3a..c3b25b1 100644
--- a/t/stackable.t
+++ b/t/stackable.t
@@ -1,37 +1,31 @@
 use strict;
 use warnings;
 use Test::More;
-use File::Temp qw(tempdir);
-use Cwd;
+use File::Spec;
+use Config;
 
-plan tests => 19;
+plan tests => 24;
 
 use local::lib ();
 
-sub mk_temp_dir
-{
-    my $name_template = shift;
-
-    my $path = tempdir($name_template, DIR => Cwd::abs_path('t'), CLEANUP => 1);
-    local::lib->ensure_dir_structure_for($path);
-    # On Win32 the path where the distribution is built usually contains
-    # spaces. This is a problem for some parts of the CPAN toolchain, so
-    # local::lib uses the GetShortPathName trick do get an alternate
-    # representation of the path that doesn't constain spaces.
-    return ($^O eq 'MSWin32')
-         ? Win32::GetShortPathName($path)
-	 : $path
-}
+use lib 't/lib'; use TempDir;
 
 my $dir1 = mk_temp_dir('test_local_lib-XXXXX');
 my $dir2 = mk_temp_dir('test_local_lib-XXXXX');
 
+my ($dir1_arch, $dir2_arch) = map { File::Spec->catfile($_, qw'lib perl5', $Config{archname}) } $dir1, $dir2;
+note $dir1_arch;
+note $dir2_arch;
+
+
 my $prev_active = () = local::lib->active_paths;
 
 local::lib->import($dir1);
 is +() = local::lib->active_paths, $prev_active + 1, 'one active path';
 like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir1/, 'added one dir in root';
 like $ENV{PERL5LIB}, qr/\Q$dir1/, 'added one dir in lib';
+note $ENV{PERL5LIB};
+unlike $ENV{PERL5LIB}, qr/\Q$dir1_arch/, 'no arch in PERL5LIB';
 like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first path is installation target';
 
 local::lib->import($dir1);
@@ -41,8 +35,10 @@ local::lib->import($dir2);
 is +() = local::lib->active_paths, $prev_active + 2, 'two active paths';
 like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir2/, 'added another dir in root';
 like $ENV{PERL5LIB}, qr/\Q$dir2/, 'added another dir in lib';
+unlike $ENV{PERL5LIB}, qr/\Q$dir2_arch/, 'no arch in PERL5LIB';
 like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir1/, 'first dir is still in root';
 like $ENV{PERL5LIB}, qr/\Q$dir1/, 'first dir is still in lib';
+unlike $ENV{PERL5LIB}, qr/\Q$dir1_arch/, 'no arch in PERL5LIB';
 like $ENV{PERL_MM_OPT}, qr/\Q$dir2/, 'second path is installation target';
 
 local::lib->import($dir1);
@@ -54,6 +50,8 @@ like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first path is installation target again';
 local::lib->import('--deactivate', $dir2);
 unlike $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir2/, 'second dir was removed from root';
 unlike $ENV{PERL5LIB}, qr/\Q$dir2/, 'second dir was removed from lib';
+unlike $ENV{PERL5LIB}, qr/\Q$dir2_arch/, 'no arch in PERL5LIB';
 like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir1/, q{first dir didn't go away from root};
 like $ENV{PERL5LIB}, qr/\Q$dir1/, q{first dir didn't go away from lib};
+unlike $ENV{PERL5LIB}, qr/\Q$dir1_arch/, 'no arch in PERL5LIB';
 like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first dir stays installation target';