Changeset 6071
- Timestamp:
- 11/16/06 20:14:05
- Files:
-
- trunk/lib/jerbil/java_helper.rb (modified) (2 diffs)
- trunk/lib/jerbil/testng_task.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/jerbil/java_helper.rb
r6060 r6071 93 93 94 94 if JAVA_DEBUG || ENV['JAVA_DEBUG'] 95 suspend = ENV['JAVA_DEBUG'].to_s.index('suspend') ? 'y' : 'n' 95 96 jvmargs += [ 96 97 "-Xdebug", 97 98 "-Xnoagent", 98 "-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend= n" ]99 "-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=#{suspend}" ] 99 100 end 100 101 … … 106 107 107 108 if build_dir 109 jerbil_debug = ENV['JERBIL_DEBUG'] ? 'true' : 'false' 110 108 111 jvmargs += [ "-Djava.system.class.loader=JerbilClassLoader", 109 "-Djerbil.build.root=#{build_dir.to_a.join(':')}", "-Djerbil.debug= false" ]112 "-Djerbil.build.root=#{build_dir.to_a.join(':')}", "-Djerbil.debug=#{jerbil_debug}" ] 110 113 else 111 114 $stderr << "jerbil: build_dir not set: dynamic classloading is disabled\n" if Rake.application.options.trace trunk/lib/jerbil/testng_task.rb
r6056 r6071 133 133 134 134 def onTestSuccess(result) 135 $stderr.print "." 135 $stderr.print "." 136 136 end 137 137 … … 154 154 155 155 def log(s) 156 (@outfile || $stderr).puts s.to_s 156 @outfile.puts(s.to_s) if @outfile 157 $stderr.puts(s.to_s) if Rake.application.options.trace 157 158 end 158 159 end
