Integrate mainline

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / MM_Any.pm

diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
index 214c316..fb48ae2 100644 (file)
--- a/lib/ExtUtils/MM_Any.pm
+++ b/lib/ExtUtils/MM_Any.pm
@@ -145,8 +145,8 @@ Used on the t/*.t files.
 sub test_via_harness {
     my($self, $perl, $tests) = @_;
 
-    return qq{\t$perl "-MExtUtils::testlib" "-MExtUtils::Command::MM" }.
-           qq{"-e" "test_harness(\$(TEST_VERBOSE))" $tests\n};
+    return qq{\t$perl "-MExtUtils::Command::MM" }.
+           qq{"-e" "test_harness(\$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n};
 }
 
 =item test_via_script
@@ -164,7 +164,7 @@ formatting.
 
 sub test_via_script {
     my($self, $perl, $script) = @_;
-    return "\t$perl \$(TEST_LIBS) $script\n";
+    return qq{\t$perl "-I\$(INST_LIB)" "-I\$(INST_ARCHLIB)" $script\n};
 }
 
 =back