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

diff --git a/t/stackable.t b/t/stackable.t
index c3b25b1..1922245 100644
--- a/t/stackable.t
+++ b/t/stackable.t
@@ -10,6 +10,8 @@ use local::lib ();
 
 use lib 't/lib'; use TempDir;
 
+delete $ENV{PERL_LOCAL_LIB_ROOT};
+
 my $dir1 = mk_temp_dir('test_local_lib-XXXXX');
 my $dir2 = mk_temp_dir('test_local_lib-XXXXX');
 
@@ -17,7 +19,6 @@ my ($dir1_arch, $dir2_arch) = map { File::Spec->catfile($_, qw'lib perl5', $Conf
 note $dir1_arch;
 note $dir2_arch;
 
-
 my $prev_active = () = local::lib->active_paths;
 
 local::lib->import($dir1);
@@ -26,7 +27,8 @@ 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';
+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';
@@ -39,13 +41,14 @@ 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';
+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';
@@ -54,4 +57,4 @@ 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';
+like $ENV{PERL_MM_OPT}, qr/\Q$dir1_escape/, 'first dir stays installation target';