Push test args injection down into iterator creation to cover all cases.

AndyA · Jul 11, 2010 · 80cf038 · 80cf038 · avar · Jul 11, 2010
1 parent f21ad26
commit 80cf038
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/TAP/Parser.pm b/lib/TAP/Parser.pm
@@ -452,7 +452,7 @@ sub make_result           { shift->result_factory_class->make_result(@_); }
         }
         elsif ($exec) {
             $type = 'exec ' . $exec->[0];
-            $source->raw( { exec => [ @$exec, @$test_args ] } );
+            $source->raw( { exec => $exec } );
         }
         elsif ($raw_source) {
             $type = 'source ' . ref($raw_source) || $raw_source;

diff --git a/lib/TAP/Parser/SourceHandler/Executable.pm b/lib/TAP/Parser/SourceHandler/Executable.pm
@@ -120,6 +120,8 @@ sub make_iterator {
     $class->_autoflush( \*STDOUT );
     $class->_autoflush( \*STDERR );
 
+    push @command, @{ $source->test_args || [] };
+
     return $class->iterator_class->new(
         {   command => \@command,
             merge   => $source->merge