X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fstackable.t;h=1922245c16f60a933a72544f1ddb694e25ec46a9;hb=7c0e6b545126be7e9f7eccc5dd7dbaa0c0128090;hp=ab6263bb91a33411a2281b4f762873521b4f56e5;hpb=b4d420efb8cd1cc7c108154d9cf569941c394aae;p=p5sagit%2Flocal-lib.git

diff --git a/t/stackable.t b/t/stackable.t
index ab6263b..1922245 100644
--- a/t/stackable.t
+++ b/t/stackable.t
@@ -1,30 +1,16 @@
 use strict;
 use warnings;
 use Test::More;
-use File::Temp qw(tempdir);
 use File::Spec;
-use Cwd;
 use Config;
-use Carp::Always;
 
 plan tests => 24;
 
 use local::lib ();
 
-sub mk_temp_dir
-{
-    my $name_template = shift;
+use lib 't/lib'; use TempDir;
 
-    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
-}
+delete $ENV{PERL_LOCAL_LIB_ROOT};
 
 my $dir1 = mk_temp_dir('test_local_lib-XXXXX');
 my $dir2 = mk_temp_dir('test_local_lib-XXXXX');
@@ -33,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);
@@ -42,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';
@@ -55,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';
@@ -70,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';