svn commit: r655764 - in /incubator/buildr/trunk: CHANGELOG lib/buildr/java/test_frameworks.rb

[as...@apache.org]

Author: assaf
Date: Tue May 13 00:49:56 2008
New Revision: 655764

URL: http://svn.apache.org/viewvc?rev=655764&view=rev
Log:
Fixed: JUnit now accepts java_args and passes these arguments to the JVM
(only applicable when forking).

Modified:
    incubator/buildr/trunk/CHANGELOG
    incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb

Modified: incubator/buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=655764&r1=655763&r2=655764&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Tue May 13 00:49:56 2008
@@ -3,6 +3,8 @@
 * Changed: Upgraded to Net::SSH 2.0 and Net::SFTP 2.0.
 * Fixed: BUILDR-67 HTTP GET now works with query parameters (Tommy Knowlton).
 * Fixed: BUILDR-68 Now accepting JAVA_HOME setting on OS X (Nathan Hamblen).
+* Fixed: JUnit now accepts java_args and passes these arguments to the JVM
+(only applicable when forking).
 
 1.3.0 (2008-04-25)
 * Added: Testing with EasyB (Nicolas Modrzyk).

Modified: incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb?rev=655764&r1=655763&r2=655764&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/test_frameworks.rb Tue May 13 00:49:56 2008
@@ -200,7 +200,8 @@
         ant.junit forking.merge(:clonevm=>options[:clonevm] || false, :dir=>task.send(:project).path_to) do
           ant.classpath :path=>dependencies.join(File::PATH_SEPARATOR)
           (options[:properties] || []).each { |key, value| ant.sysproperty :key=>key, :value=>value }
-          (options[:environment] || []).each { |key, value| ant.env :key=>key, :value=>value }
+          (options[:properties] || []).each { |key, value| ant.sysproperty :key=>key, :value=>value }
+          Array(options[:java_args]).each { |value| ant.jvmarg :value=>value }
           ant.formatter :type=>'plain'
           ant.formatter :type=>'plain', :usefile=>false # log test
           ant.formatter :type=>'xml'