Changeset 5858

Show
Ignore:
Timestamp:
10/10/06 15:27:08
Author:
jan
Message:

tests pass on DOS

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/java_task.rb

    r5857 r5858  
    6767        end 
    6868         
    69         parms = [ "-cp", cp, "-Xmx#{max_mem}M", "-server" ] 
     69        parms = [ "-cp", cp, "-Xmx#{max_mem}M" ] 
    7070        parms += vmargs 
    7171         

  • trunk/test/test_build.rb

    r5857 r5858  
    7272   
    7373  def run_rake(*args) 
    74     Dir.chdir("sample") do      
    75       sh "rake --quiet #{args.join(" ")}" do |ok,res| 
     74    Dir.chdir("sample") do 
     75      #sh "rake --quiet #{args.join(' ')}" do |ok,res| 
     76      cmd = args.join(" ") 
     77      #on windows, exec invokes a subshell which does not inherit environment variables, 
     78      #therefore we cannot invoke directly 
     79      ruby %{-rubygems -e "require 'rake'; Rake.application.run" #{cmd} --quiet} do |ok,res| 
     80        flunk "could not invoke rake" if res.nil? 
    7681        flunk "rake failed: #{res}" unless ok  
    7782        yield(ok, res) if block_given?