X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=Makefile.PL;h=d83108e70875eba7dd898ed2f5ac756761fb0e9e;hp=66236284379079d1e9eb90961577b2cc382696bf;hb=4aaed9e5cc435a2085e46f4c98a3abc233ecacaf;hpb=3310ddf29da76ecf40333e91b0c855113943dab3

diff --git a/Makefile.PL b/Makefile.PL
index 6623628..d83108e 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,11 +16,9 @@ all_from 'lib/Mouse.pm';
 requires 'Scalar::Util' => 1.14;
 
 test_requires 'Test::More'      => 0.88;
-test_requires 'Test::Exception' => 0.27;
+test_requires 'Test::Exception' => 0.29;
 # test_requires 'Test::Output'    => 0.16; # too many dependencies!
 
-include_deps 'Test::Exception'; # work around 0.27_0x (its use of diehook might be wrong)
-
 if($] < 5.010) {
     recommends 'Class::C3';
 }
@@ -67,6 +65,8 @@ else{
 
 
 tests 't/*.t t/*/*.t';
+author_tests 'xt';
+
 
 repository 'git://git.moose.perl.org/Mouse.git';
 
@@ -80,7 +80,15 @@ if (author_context()) {
         print "You have Moose ", Moose->VERSION, ".\n";
         if (eval { require Module::Install::AuthorTests }) {
             do 'tool/create-moose-compatibility-tests.pl';
-            recursive_author_tests('xt');
+            # repeat testing
+            # see also ExtUtils::MM_Any::test_via_harness()
+            my $t_moose =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
+                          .q{ "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                          .q{ xt/compatibility/t/*/*.t } . "\n";
+
+            postamble qq{test_dynamic :: test_moose\n\n}
+                    . qq{test_moose :: pure_all\n}
+                    . qq{\t} . $t_moose;
         } else {
             print "You don't have a M::I::AuthorTests.\n";
         }
@@ -91,14 +99,15 @@ if (author_context()) {
     if($use_xs){
         # repeat testing
         # see also ExtUtils::MM_Any::test_via_harness()
-        my $test_via_harness =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
-                               .q{ "do 'tool/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
-                               .q{ $(TEST_FILES)} . "\n";
+        my $t_pp =  q{$(FULLPERLRUN) -MExtUtils::Command::MM -e}
+                   .q{ "do 'tool/force-pp.pl'; test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"}
+                   .q{ $(TEST_FILES)} . "\n";
 
         postamble qq{test_dynamic :: test_pp\n\n}
                 . qq{test_pp :: pure_all\n}
-                . qq{\t} . $test_via_harness;
+                . qq{\t} . $t_pp;
     }
 }
 
+
 WriteAll check_nmake => 0;