Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8899ea8ab9a9
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f73123c195d
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 4, 2015

  1. Add spec:ruby:fast:jit target for JIT testing.

    @headius
    headius committed Mar 4, 2015
    Copy the full SHA
    345e57c View commit details

  2. Fix entry point for compiler specs.

    @headius
    headius committed Mar 4, 2015
    Copy the full SHA
    4025e5d View commit details

  3. Ensure JIT doesn't run in background for testing.

    @headius
    headius committed Mar 4, 2015
    Copy the full SHA
    4f73123 View commit details
Showing with 11 additions and 2 deletions.
  1. +9 −0 rakelib/rubyspec.rake
  2. +1 −1 rakelib/test.rake
  3. +1 −1 spec/compiler/general_spec.rb
9 changes: 9 additions & 0 deletions rakelib/rubyspec.rake
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,15 @@ namespace :spec do
:jruby_opts => "--dev"
end

desc "Run fast specs that do not spawn many subprocesses"
task :'ruby:fast:jit' do
mspec :compile_mode => "JIT",
:jit_threshold => 0,
:format => 's',
:spec_target => ":fast",
:jruby_opts => "--dev"
end

desc "Run rubyspecs expected to pass"
task :ci => ['spec:tagged']

2 changes: 1 addition & 1 deletion rakelib/test.rake
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ namespace :test do
compile_flags = {
:default => :int,
:int => ["-X-C"],
:jit => ["-Xjit.threshold=0", "-J-XX:MaxPermSize=512M"],
:jit => ["-Xjit.threshold=0", "-Xjit.background=false" "-J-XX:MaxPermSize=512M"],
:aot => ["-X+C", "-J-XX:MaxPermSize=512M"],
:all => [:int, :jit, :aot]
}
2 changes: 1 addition & 1 deletion spec/compiler/general_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ def compile_to_method(src, filename, lineno)
compiler = oj.ir.targets.JVMVisitor.new
compiled = compiler.compile(method, oj.util.OneShotClassLoader.new(JRuby.runtime.getJRubyClassLoader()))
scriptMethod = compiled.getMethod(
"__script__",
"RUBY$script",
oj.runtime.ThreadContext.java_class,
oj.parser.StaticScope.java_class,
oj.runtime.builtin.IRubyObject.java_class,