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

Commits on May 23, 2016

  1. Copy the full SHA
    abb46bf View commit details
  2. Copy the full SHA
    6b55492 View commit details
2 changes: 1 addition & 1 deletion lib/ruby/truffle/jruby+truffle/gem_ci/activemodel.rb
Original file line number Diff line number Diff line change
@@ -8,5 +8,5 @@

has_to_succeed setup

result run(%w[--require-pattern test/**/*_test.rb -r exclude_tests -- -I test -e nil], raise: false)
result run(%w[--require-pattern test/**/*_test.rb -- -I test -e nil], raise: false)

Original file line number Diff line number Diff line change
@@ -70,14 +70,6 @@
java.rb: nil
bcrypt_ext.rb: nil
bundler.rb: "module Bundler; def self.setup; end; end"
# mock method_source gem
# method_source.rb: nil
exclude_tests.rb: |
failures = { AttributeMethodsTest: [:"test_#define_attribute_methods_generates_attribute_methods",
:"test_#define_attribute_methods_generates_attribute_methods_with_spaces_in_their_names",
:"test_#define_attribute_methods_works_passing_multiple_arguments"] }
Truffle.exclude_rspec_examples failures

# do not let bundler to install db gem group
:without:
@@ -90,6 +82,5 @@
- rubygems
- shims
- openssl-stubs
- truffle/exclude_rspec_examples
:environment:
N: 1
Original file line number Diff line number Diff line change
@@ -1233,7 +1233,7 @@ public boolean isMethodDefined(DynamicObject module, String name, boolean inheri
method = Layouts.MODULE.getFields(module).getMethod(name);
}

return method != null && !method.getVisibility().isPrivate();
return method != null && !method.getVisibility().isPrivate() && !method.isUndefined();
}

}