From: Graham Knop Date: Tue, 1 Oct 2013 12:58:04 +0000 (-0400) Subject: ignore outer local::lib in test instead of coping with it X-Git-Tag: 1.008024~5 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=commitdiff_plain;h=8b0f74fc504a43c6d3dae01869f6e5b6933c5131 ignore outer local::lib in test instead of coping with it --- diff --git a/t/bad_variables.t b/t/bad_variables.t index 1de140c..5321bb7 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'); @@ -29,8 +26,8 @@ local::lib->import($dir1); is( $ENV{PERL_LOCAL_LIB_ROOT}, - join($Config{path_sep}, (grep { defined $_ and $_ ne '' } $orig_llr, $dir2, $dir1)), - 'dir1 should have been removed and added back in at the top (PERL_LOCAL_LIB_ROOT was ' . $orig_llr . ')', + join($Config{path_sep}, (grep { defined $_ and $_ ne '' } $dir2, $dir1)), + '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');