Author: dagolden
Date: Sun Aug 30 08:58:13 2009
New Revision: 13235

Modified:
   Module-Build/trunk/Changes
   Module-Build/trunk/lib/Module/Build/Compat.pm
   Module-Build/trunk/t/compat.t

Log:
Fix recursive test files in generated Makefile.PL



Modified: Module-Build/trunk/Changes
==============================================================================
--- Module-Build/trunk/Changes  (original)
+++ Module-Build/trunk/Changes  Sun Aug 30 08:58:13 2009
@@ -12,6 +12,7 @@
 
  Bug fixes:
  - Fix the t/destinations.t fix. [David Golden, with thanks to Eric Wilhelm]
+ - Fix recursive test files in generated Makefile.PL (RT#49254) [Sawyer X]
 
 0.35 - Thu Aug 27 09:12:02 EDT 2009
 

Modified: Module-Build/trunk/lib/Module/Build/Compat.pm
==============================================================================
--- Module-Build/trunk/lib/Module/Build/Compat.pm       (original)
+++ Module-Build/trunk/lib/Module/Build/Compat.pm       Sun Aug 30 08:58:13 2009
@@ -189,7 +189,7 @@
     $MM_Args{PL_FILES} = $build->PL_files || {};
 
     if ($build->recursive_test_files) {
-        $MM_Args{TESTS} = join q{ }, $package->_test_globs($build);
+        $MM_Args{test} = { TESTS => join q{ }, $package->_test_globs($build) };
     }
 
     local $Data::Dumper::Terse = 1;

Modified: Module-Build/trunk/t/compat.t
==============================================================================
--- Module-Build/trunk/t/compat.t       (original)
+++ Module-Build/trunk/t/compat.t       Sun Aug 30 08:58:13 2009
@@ -299,12 +299,18 @@
 
   create_makefile_pl('traditional', $mb);
   my $args = extract_writemakefile_args() || {};
-  is $args->{TESTS}, 
-    join( q{ }, 
-      File::Spec->catfile(qw(t *.t)),
-      File::Spec->catfile(qw(t deep *.t))
-    ),
-    'Makefile.PL has correct TESTS line for recursive test files';
+
+  if ( exists $args->{test}->{TESTS} ) {
+    is $args->{test}->{TESTS},
+      join( q{ },
+        File::Spec->catfile(qw(t *.t)),
+        File::Spec->catfile(qw(t deep *.t))
+      ),
+      'Makefile.PL has correct TESTS line for recursive test files';
+  } else {
+    ok( ! exists $args->{TESTS}, 'Not using incorrect recursive tests key' );
+  }
+
 }
 
 # cleanup

Reply via email to