Revert commit 59c2e8, add test for PM_FILTER, fix RT-144085

Author: mohawk2

lib/ExtUtils/MM_Unix.pm

@@ -2151,11 +2151,6 @@ sub init_PERL {
     # already escaped spaces.
     $self->{FULLPERL} =~ tr/"//d if $Is{VMS};
 
-    # `dmake` can fail for image (aka, executable) names which start with double-quotes
-    # * push quote inward by at least one character (or the drive prefix, if present)
-    # * including any initial directory separator preserves the `file_name_is_absolute` property
-    $self->{FULLPERL} =~ s/^"(\S(:\\|:)?)/$1"/ if $self->is_make_type('dmake');
-
     # Little hack to get around VMS's find_perl putting "MCR" in front
     # sometimes.
     $self->{ABSPERL} = $self->{PERL};
@@ -2178,11 +2173,6 @@ sub init_PERL {
     # already escaped spaces.
     $self->{PERL} =~ tr/"//d if $Is{VMS};
 
-    # `dmake` can fail for image (aka, executable) names which start with double-quotes
-    # * push quote inward by at least one character (or the drive prefix, if present)
-    # * including any initial directory separator preserves the `file_name_is_absolute` property
-    $self->{PERL} =~ s/^"(\S(:\\|:)?)/$1"/ if $self->is_make_type('dmake');
-
     # Are we building the core?
     $self->{PERL_CORE} = $ENV{PERL_CORE} unless exists $self->{PERL_CORE};
     $self->{PERL_CORE} = 0               unless defined $self->{PERL_CORE};
@@ -3201,11 +3191,17 @@ pm_to_blib : $(FIRST_MAKEFILE) $(TO_INST_PM)
 
     # VMS will swallow '' and PM_FILTER is often empty.  So use q[]
     my $pm_to_blib = $self->oneliner(<<CODE, ['-MExtUtils::Install']);
-pm_to_blib({\@ARGV}, '$autodir', q[\$(PM_FILTER)], '\$(PERM_DIR)')
+\$i=0; \$i++ until \$i > \$#ARGV or \$ARGV[\$i] eq "--";
+die "Failed to find -- in ".join("|",\@ARGV) if \$i > \$#ARGV;
+\@parts=splice \@ARGV,0,\$i+1;
+pop \@parts; \$filter=join " ", map qq{"\$_"}, \@parts;
+pm_to_blib({\@ARGV}, '$autodir', \$filter, '\$(PERM_DIR)')
 CODE
+    $pm_to_blib .= q[ $(PM_FILTER) --];
 
     my @cmds = $self->split_command($pm_to_blib,
-                  map { ($self->quote_literal($_) => $self->quote_literal($self->{PM}->{$_})) } sort keys %{$self->{PM}});
+      map +($self->quote_literal($_) => $self->quote_literal($self->{PM}{$_})),
+        sort keys %{$self->{PM}});
 
     $r .= join '', map { "\t\$(NOECHO) $_\n" } @cmds;
     $r .= qq{\t\$(NOECHO) \$(TOUCH) pm_to_blib\n};

lib/ExtUtils/MakeMaker.pm

@@ -693,7 +693,6 @@ END
             } else {
                 my $value = $self->{$key};
                 # not going to test in FS so only stripping start
-                $value =~ s/"// if $key =~ /PERL$/ and $self->is_make_type('dmake');
                 $value =~ s/^"// if $key =~ /PERL$/;
                 $value = $self->catdir("..", $value)
                   unless $self->file_name_is_absolute($value);

t/basic.t

@@ -25,7 +25,7 @@ use ExtUtils::MM;
 use Test::More
     !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
     ? (skip_all => "cross-compiling and make not available")
-    : (tests => 195);
+    : (tests => 198);
 use File::Find;
 use File::Spec;
 use File::Path;
@@ -472,6 +472,18 @@ $realclean_out = run("$make realclean");
 rmtree 'Liar';
 rmtree $DUMMYINST;
 
+# test PM_FILTER - RT#144085
+$text = $preserve_MPL;
+ok(($text =~ s:\);:    PM_FILTER => '\$(ABSPERLRUN) -ne "print unless /^\\#/"',\n$&:), 'successful M.PL edit');
+write_file($file, $text);
+@mpl_out = run(qq{$perl Makefile.PL});
+$test_out = run("$make test NOECHO=");
+like( $test_out, qr/All tests successful/, 'make test' );
+is( $?, 0,                                 '  exited normally' ) ||
+    diag $test_out;
+write_file($file, $preserve_MPL); # restore Makefile.PL
+$realclean_out = run("$make realclean");
+
 sub _normalize {
     my $hash = shift;
     %$hash= map { lc($_) => $hash->{$_} } keys %$hash;