X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fbad_variables.t;h=d72ab48f2c829dc86fa935e5b3d67a707c203a6d;hb=e4b5a839e0809ecbc5504bdcf80ce3010e22595b;hp=40d1c00aeb5e8b0f29c4f8d7bd17505f898c791e;hpb=5897c2367a3b608e1bfe46309b65b80b971fce7a;p=p5sagit%2Flocal-lib.git

diff --git a/t/bad_variables.t b/t/bad_variables.t
index 40d1c00..d72ab48 100644
--- 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, $dir3, $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');