X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstackable.t;h=1922245c16f60a933a72544f1ddb694e25ec46a9;hb=974b12252f63b448eb0435c50169d9f76d688de5;hp=973e4f7a4e20bf30d46ff5b9a848910c9b5666e1;hpb=f694b8aab88c8eca9acb502493935a08d9860f3a;p=p5sagit%2Flocal-lib.git

diff --git a/t/stackable.t b/t/stackable.t
index 973e4f7..1922245 100644
--- a/t/stackable.t
+++ b/t/stackable.t
@@ -1,18 +1,23 @@
 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 ();
 
-my $dir1 = tempdir('test_local_lib-XXXXX', DIR => Cwd::abs_path('t'), CLEANUP => 1);
-$dir1 = local::lib->ensure_dir_structure_for($dir1);
+use lib 't/lib'; use TempDir;
 
-my $dir2 = tempdir('test_local_lib-XXXXX', DIR => Cwd::abs_path('t'), CLEANUP => 1);
-$dir2 = local::lib->ensure_dir_structure_for($dir2);
+delete $ENV{PERL_LOCAL_LIB_ROOT};
+
+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;
 
@@ -20,7 +25,10 @@ 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';
-like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first path is installation target';
+note $ENV{PERL5LIB};
+unlike $ENV{PERL5LIB}, qr/\Q$dir1_arch/, 'no arch in PERL5LIB';
+my $dir1_escape = local::lib::_mm_escape_path($dir1);
+like $ENV{PERL_MM_OPT}, qr/\Q$dir1_escape/, 'first path is installation target';
 
 local::lib->import($dir1);
 is +() = local::lib->active_paths, $prev_active + 1, 'still one active path after adding it twice';
@@ -29,19 +37,24 @@ 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';
-like $ENV{PERL_MM_OPT}, qr/\Q$dir2/, 'second path is installation target';
+unlike $ENV{PERL5LIB}, qr/\Q$dir1_arch/, 'no arch in PERL5LIB';
+my $dir2_escape = local::lib::_mm_escape_path($dir2);
+like $ENV{PERL_MM_OPT}, qr/\Q$dir2_escape/, 'second path is installation target';
 
 local::lib->import($dir1);
 my @active = local::lib->active_paths;
 is @active, $prev_active + 2, 'still two active dirs after re-adding first';
-is $active[-1], $dir1, 'first dir was re-added on top';
-like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first path is installation target again';
+is $active[0], $dir1, 'first dir was re-added on top';
+like $ENV{PERL_MM_OPT}, qr/\Q$dir1_escape/, '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};
-like $ENV{PERL_MM_OPT}, qr/\Q$dir1/, 'first dir stays installation target';
+unlike $ENV{PERL5LIB}, qr/\Q$dir1_arch/, 'no arch in PERL5LIB';
+like $ENV{PERL_MM_OPT}, qr/\Q$dir1_escape/, 'first dir stays installation target';