VMS fixups (from Dan Sugalski); cosmetic tweaks

p4raw-id: //depot/perl@5378

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/Test/Harness.pm b/lib/Test/Harness.pm
index 61a29dbaaa..820c661205 100644
--- a/lib/Test/Harness.pm
+++ b/lib/Test/Harness.pm
@@ -64,9 +64,20 @@ sub runtests {
 
     # pass -I flags to children
     my $old5lib = $ENV{PERL5LIB};
-    local($ENV{'PERL5LIB'}) = join($Config{path_sep}, @INC);
 
-    if ($^O eq 'VMS') { $switches =~ s/-(\S*[A-Z]\S*)/"-$1"/g }
+    # VMS has a 255-byte limit on the length of %ENV entries, so
+    # toss the ones that involve perl_root, the install location
+    # for VMS
+    my $new5lib;
+    if ($^O eq 'VMS') {
+	$new5lib = join($Config{path_sep}, grep {!/perl_root/i;} @INC);
+	$switches =~ s/-(\S*[A-Z]\S*)/"-$1"/g;
+    }
+    else {
+        $new5lib = join($Config{path_sep}, @INC);
+    }
+
+    local($ENV{'PERL5LIB'}) = $new5lib;
 
     my @dir_files = globdir $files_in_dir if defined $files_in_dir;
     my $t_start = new Benchmark;