svn commit: r831563 - /buildr/trunk/lib/buildr/scala/bdd.rb

[dj...@apache.org]

Author: djspiewak
Date: Sat Oct 31 16:47:13 2009
New Revision: 831563

URL: http://svn.apache.org/viewvc?rev=831563&view=rev
Log:
Name the spec being run (rather than the runner util)

Modified:
    buildr/trunk/lib/buildr/scala/bdd.rb

Modified: buildr/trunk/lib/buildr/scala/bdd.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/bdd.rb?rev=831563&r1=831562&r2=831563&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/bdd.rb (original)
+++ buildr/trunk/lib/buildr/scala/bdd.rb Sat Oct 31 16:47:13 2009
@@ -73,7 +73,7 @@
       
       filter = Java.org.apache.buildr.JavaTestFilter.new(dependencies.to_java(Java.java.lang.String))
       filter.add_fields ['MODULE$'].to_java(Java.java.lang.String)
-      filter.filter(candidates.to_java(Java.java.lang.String))      # we only want singletons
+      filter.filter(candidates.to_java(Java.java.lang.String)).map { |s| s[0..(s.size - 2)] }
     end
     
     def run(specs, dependencies)  #:nodoc:
@@ -85,11 +85,13 @@
 
       runner = 'org.apache.buildr.SpecsSingletonRunner'
       specs.inject [] do |passed, spec|
+        cmd_options[:name] = spec
+        
         begin
           unless Util.win_os?
-            Java::Commands.java(runner, task.compile.target.to_s, '-c', spec, cmd_options)
+            Java::Commands.java(runner, task.compile.target.to_s, '-c', spec + '$', cmd_options)
           else
-            Java::Commands.java(runner, task.compile.target.to_s, spec, cmd_options)
+            Java::Commands.java(runner, task.compile.target.to_s, spec + '$', cmd_options)
           end
         rescue => e
           passed