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

Commits on May 30, 2016

  1. 4
    Copy the full SHA
    4bd8b3d View commit details
  2. [Truffle] job group of gems is not needed for AS tests

    was causing a false failure of test_uniq_load_paths
    pitr-ch committed May 30, 2016
    Copy the full SHA
    de5bdc9 View commit details
  3. Copy the full SHA
    d72f1da View commit details
  4. Copy the full SHA
    5366c61 View commit details
5 changes: 4 additions & 1 deletion core/src/main/java/org/jruby/runtime/load/LoadService.java
Original file line number Diff line number Diff line change
@@ -308,7 +308,10 @@ protected void addPath(String path) {
if (path == null || path.length() == 0) return;
final RubyArray loadPath = this.loadPath;
synchronized(loadPath) {
loadPath.append(runtime.newString(path.replace('\\', '/')));
final RubyString pathToAdd = runtime.newString(path.replace('\\', '/'));
// Do not add duplicated paths
if (loadPath.includes(runtime.getCurrentContext(), pathToAdd)) return;
loadPath.append(pathToAdd);
}
}

2 changes: 1 addition & 1 deletion lib/ruby/truffle/jruby+truffle/gem_ci/activesupport.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
@@ -41,16 +41,11 @@
bundler.rb: "module Bundler; def self.setup; end; end"
# mock method_source gem
method_source.rb: nil
exclude_tests.rb: |
failures = { LoadPathsTest: [:test_uniq_load_paths] }
require 'truffle/exclude_rspec_examples'
Truffle.exclude_rspec_examples failures

# do not let bundler to install db gem group
:without:
- db
- job
:before:
# temporary workaround, rake 10.4.2 will not install
- ruby -e 'File.write "../Gemfile.lock", File.read("../Gemfile.lock").gsub(/rake \(10\.4\.2\)/,"rake (11.1.2)")'
1 change: 0 additions & 1 deletion spec/truffle/tags/core/io/pos_tags.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
fails:IO#pos resets #eof?
fails:IO#pos= does not accept Bignums that don't fit in a C long