don't try to create paths if we are deactivating

[p5sagit/local-lib.git] / t / bad_variables.t

diff --git a/t/bad_variables.t b/t/bad_variables.t
index 40d1c00..f18a6a7 100644 (file)
--- a/t/bad_variables.t
+++ b/t/bad_variables.t
@@ -7,10 +7,7 @@ use local::lib ();
 
 use lib 't/lib'; use TempDir;
 
-# remember the original value of this, in case we are already running inside a
-# local::lib
-my $orig_llr = $ENV{PERL_LOCAL_LIB_ROOT} || '';
-$orig_llr = '' if $orig_llr eq $Config{path_sep};
+delete $ENV{PERL_LOCAL_LIB_ROOT};
 
 my $dir1 = mk_temp_dir('test_local_lib-XXXXX');
 my $dir2 = mk_temp_dir('test_local_lib-XXXXX');
@@ -23,14 +20,14 @@ local::lib->import($dir1);
 local::lib->import($dir2);
 
 # we have junk in here now
-$ENV{PERL_LOCAL_LIB_ROOT} .= $Config{path_sep} . $dir3;
+$ENV{PERL_LOCAL_LIB_ROOT} = $dir3 . $Config{path_sep} . $ENV{PERL_LOCAL_LIB_ROOT};
 
 local::lib->import($dir1);
 
 is(
     $ENV{PERL_LOCAL_LIB_ROOT},
-    join($Config{path_sep}, (grep { $_ } $orig_llr, $dir2, $dir1)),
-    'dir1 should have been removed and added back in at the top',
+    join($Config{path_sep}, (grep { defined $_ and $_ ne '' } $dir1, $dir2)),
+    'dir1 should have been removed and added back in at the top'
 );
 
 ok((grep { /\Q$dir1\E/ } @INC), 'new dir has been added to @INC');