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: c0314ab9b509
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 876c0481b554
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 22, 2015

  1. Symbol#to_proc procs' #parameters always return [[:rest]]. 

    This is for rspec/rspec-mocks#1044.
    @headius
    headius committed Dec 22, 2015
    1
    Copy the full SHA
    bc3da90 View commit details

  2. Add :fullint target for all rake test targets. 

    Added :fullint for the two rake test targets we run jit on now,
test:mri and test:jruby.
    @headius
    headius committed Dec 22, 2015
    Copy the full SHA
    876c048 View commit details
Showing with 12 additions and 1 deletion.
  1. +2 −0 .travis.yml
  2. +6 −0 core/src/main/java/org/jruby/RubySymbol.java
  3. +1 −0 core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java
  4. +3 −1 rakelib/test.rake
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -27,8 +27,10 @@ env:
matrix:
- PHASE='-Ptest'
- PHASE='-Prake -Dtask=test:jruby'
- PHASE='-Prake -Dtask=test:jruby:fullint'
- PHASE='-Prake -Dtask=test:jruby:jit'
- PHASE='-Prake -Dtask=test:mri'
- PHASE='-Prake -Dtask=test:mri:fullint'
- PHASE='-Prake -Dtask=test:mri:jit'
- PHASE='-Prake -Dtask=test:slow_suites'
- PHASE='-Prake -Dtask=test:tracing'
6 changes: 6 additions & 0 deletions core/src/main/java/org/jruby/RubySymbol.java
View file
Original file line number Diff line number Diff line change
@@ -43,6 +43,7 @@
import org.jruby.ast.util.ArgsUtil;
import org.jruby.compiler.Constantizable;
import org.jruby.parser.StaticScope;
import org.jruby.runtime.ArgumentDescriptor;
import org.jruby.runtime.Block;
import org.jruby.runtime.BlockBody;
import org.jruby.runtime.CallSite;
@@ -519,6 +520,11 @@ public String getFile() {
public int getLine() {
return -1;
}

@Override
public ArgumentDescriptor[] getArgumentDescriptors() {
return ArgumentDescriptor.ANON_REST;
}
};

return RubyProc.newProc(context.runtime,
1 change: 1 addition & 0 deletions core/src/main/java/org/jruby/runtime/ArgumentDescriptor.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ public class ArgumentDescriptor {
public final String name;

public static final ArgumentDescriptor[] EMPTY_ARRAY = new ArgumentDescriptor[0];
public static final ArgumentDescriptor[] ANON_REST = {new ArgumentDescriptor(ArgumentType.rest)};

public ArgumentDescriptor(ArgumentType type, String name) {
assert name != null || type.anonymous : "null argument name given for non-anonymous argument type";
4 changes: 3 additions & 1 deletion rakelib/test.rake
View file
Original file line number Diff line number Diff line change
@@ -59,6 +59,8 @@ namespace :test do
compile_flags = {
:default => :int,
:int => ["-X-C"],
# Note: jit.background=false is implied by jit.threshold=0, but we add it here to be sure
:fullint => ["-X-C", "-Xjit.threshold=0", "-Xjit.background=false"],
:jit => ["-Xjit.threshold=0", "-Xjit.background=false", "-J-XX:MaxPermSize=512M"],
:aot => ["-X+C", "-J-XX:MaxPermSize=512M"],
:all => [:int, :jit, :aot]
@@ -79,7 +81,7 @@ namespace :test do
ruby "-X-C -r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
end

task :int_full do
task :fullint do
ruby "-Xjit.threshold=0 -Xjit.background=false -X-C -r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
end