Always preserve $ENV{$Config{ldlibpthname}}

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index 91de04459f69425f1f6a425ced54160b621461ca..c147f80a919756cbdfacfccb26bfbc866bcb6ddd 100644 (file)
--- a/lib/VPIT/TestHelpers.pm
+++ b/lib/VPIT/TestHelpers.pm
@@ -113,9 +113,9 @@ sub run_perl {
  my $ldlibpth = $ENV{$ld_name};
 
  local %ENV;
+ $ENV{$ld_name}   = $ldlibpth   if                      defined $ldlibpth;
  $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
  $ENV{PATH}       = $PATH       if $^O eq 'cygwin'  and defined $PATH;
- $ENV{$ld_name}   = $ldlibpth   if $^O eq 'android' and defined $ldlibpth;
 
  system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
 }

diff --git a/t/30-run_perl.t b/t/30-run_perl.t
index b71f7be0b592cacd2540bfa5e1917030fdf1a21e..cd040e133c8938e70fce9f21bbcbc77ea01f0ab5 100644 (file)
--- a/t/30-run_perl.t
+++ b/t/30-run_perl.t
@@ -5,7 +5,7 @@ use warnings;
 
 use VPIT::TestHelpers;
 
-use Test::More tests => 4;
+use Test::More tests => 5;
 
 use Config;
 use File::Temp;
@@ -18,10 +18,12 @@ my $ld_path = $Config::Config{ldlibpthname};
 
 my %expected_vars = (
  'MSWin32' => [ qw<SystemRoot> ],
- 'android' => [ $ld_path       ],
+ 'android' => [                ],
  'cygwin'  => [ qw<PATH>       ],
+ 'darwin'  => [                ],
  'linux'   => [                ],
 );
+push @$_, $ld_path for values %expected_vars;
 
 my @all_vars = do {
  my %uniq;
@@ -35,7 +37,7 @@ my @ignored_vars = qw<
  __CF_USER_TEXT_ENCODING
 >;
 
-for my $os (qw<MSWin32 android cygwin linux>) {
+for my $os (qw<MSWin32 android darwin cygwin linux>) {
  1 while unlink $filename;
 
  local $^O  = $os;