Skip to content

Commit

Permalink
[bench] print JJ OPTS and Java version with JRuby
Browse files Browse the repository at this point in the history
  • Loading branch information
kares committed Feb 17, 2015
1 parent cb7886e commit ba74a9f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion bench/setup.rb
Expand Up @@ -25,7 +25,11 @@
config[:database] = ENV['AR_DATABASE'] || 'arjdbc_test'

if defined? JRUBY_VERSION
puts "--- RUBY_VERSION: #{RUBY_VERSION} (JRUBY_VERSION: #{JRUBY_VERSION})"
puts "--- RUBY_VERSION: #{RUBY_VERSION} (JRUBY_VERSION: #{JRUBY_VERSION} #{ENV_JAVA['java.runtime.version']})"
jj_opts = []
jj_opts << "JRUBY_OPTS = '#{ENV['JRUBY_OPTS']}'" if ENV['JRUBY_OPTS']
jj_opts << "JAVA_OPTS = '#{ENV['JAVA_OPTS']}'" if ENV['JAVA_OPTS']
puts " #{jj_opts.join(' ')}" unless jj_opts.empty?
puts "--- ActiveRecord: #{ActiveRecord.version.to_s} (AR-JDBC: #{AR_JDBC_VERSION})"
else
puts "--- RUBY_VERSION: #{RUBY_VERSION}"
Expand Down

0 comments on commit ba74a9f

Please sign in to comment.