From: Andrew Rodland <andrew@cleverdomain.org>
Date: Thu, 24 Feb 2011 00:16:03 +0000 (-0600)
Subject: Don't fail tests when already running under local::lib
X-Git-Tag: 1.008004~4^2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=a20a4a55bd90ff313b0aacd8a79e9f8ef644c0d0

Don't fail tests when already running under local::lib
---

diff --git a/t/stackable.t b/t/stackable.t
index 0c63998..b604ee8 100644
--- a/t/stackable.t
+++ b/t/stackable.t
@@ -11,17 +11,19 @@ my $dir2 = tempdir('test_local_lib-XXXXX', DIR => Cwd::abs_path('t'), CLEANUP =>
 
 use local::lib ();
 
+my $prev_active = () = local::lib->active_paths;
+
 local::lib->import($dir1);
-is +() = local::lib->active_paths, 1, 'one active path';
+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';
 
 local::lib->import($dir1);
-is +() = local::lib->active_paths, 1, 'still one active path after adding it twice';
+is +() = local::lib->active_paths, $prev_active + 1, 'still one active path after adding it twice';
 
 local::lib->import($dir2);
-is +() = local::lib->active_paths, 2, 'two active paths';
+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';
 like $ENV{PERL_LOCAL_LIB_ROOT}, qr/\Q$dir1/, 'first dir is still in root';
@@ -30,7 +32,7 @@ like $ENV{PERL_MM_OPT}, qr/\Q$dir2/, 'second path is installation target';
 
 local::lib->import($dir1);
 my @active = local::lib->active_paths;
-is @active, 2, 'still two active dirs after re-adding first';
+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';