X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=17ed88e55d42cb663c13cf2a77d2fcfe0415823c;hb=1746908e63ce233fad3c290d731ac34aff7c2d22;hp=28e54da70cec0d54c35f77b8c5a4b20afee63a2a;hpb=9c96124c0befe46e15618b4e61b7a2baef6ae581;p=gitmo%2FMouse.git

diff --git a/Makefile.PL b/Makefile.PL
index 28e54da..17ed88e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -10,6 +10,8 @@ BEGIN{
 use strict;
 use warnings;
 BEGIN {
+    unshift @INC, 'inc';
+
 	# author requires, or bundled modules
     my @devmods = qw(
         inc::Module::Install             1.00
@@ -82,20 +84,13 @@ if($use_xs){
     use_xshelper();
     cc_warnings();
     cc_src_paths('xs-src');
-}
     if($use_xs){
-        # repeat testing
-        # see also ExtUtils::MM_Any::test_via_harness()
-        my $t_pp =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
-                   .q{ "do 'tool/force-pp.pl'; test_harness($(TEST_VERBOSE), 'inc', '$(INST_LIB)', '$(INST_ARCHLIB)')"}
-                   .q{ $(TEST_FILES)} . "\n";
-
-        postamble qq{test_pp :: pure_all\n}
-                . qq{\t} . $t_pp;
-        if($Module::Install::AUTHOR) {
-            postamble qq{test :: test_pp };
-        }
+		test_target test_pp => (
+			env => { PERL_ONLY => 1 },
+			($Module::Install::AUTHOR ? (alias => 'test') : ()),
+		);
     }
+}
 else{
     print "Mouse configured with Pure Perl.\n";
 }
@@ -119,15 +114,10 @@ if ($Module::Install::AUTHOR) {
             && eval { require Moose; Moose->VERSION($require_version) }) {
         print "You have Moose ", Moose->VERSION, ".\n";
         do 'tool/create-moose-compatibility-tests.pl';
-        # repeat testing
-        # see also ExtUtils::MM_Any::test_via_harness()
-        my $t_moose =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
-                      .q{ "test_harness($(TEST_VERBOSE), 'inc', '$(INST_LIB)', '$(INST_ARCHLIB)')"}
-                      .q{ xt/compat/t/*/*.t } . "\n";
-
-        postamble qq{test :: test_moose\n\n}
-                . qq{test_moose :: pure_all\n}
-                . qq{\t} . $t_moose;
+        test_target test_moose => (
+            tests => ['xt/compat/t/*/*.t'],
+            alias => 'test',
+        );
     } else {
         print "You don't have Moose $require_version. skipping moose compatibility test\n";
     }