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

Commits on Mar 8, 2016

  1. Copy the full SHA
    a6d3430 View commit details
  2. Copy the full SHA
    e3a853e View commit details
  3. Copy the full SHA
    e10e4e0 View commit details
Showing with 10 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +9 −3 test/mri/ruby/test_array.rb
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ matrix:
jdk: oraclejdk8
- env: JT='test mri'
- env: JTRCI='lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt'
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
- env: PHASE='-Pmain'
jdk: oraclejdk8
- env: PHASE='-Pj2ee'
jdk: oraclejdk7
12 changes: 9 additions & 3 deletions test/mri/ruby/test_array.rb
Original file line number Diff line number Diff line change
@@ -1819,9 +1819,11 @@ def test_permutation

bug3708 = '[ruby-dev:42067]'
assert_equal(b, @cls[0, 1, 2, 3, 4][1, 4].permutation.to_a, bug3708)
end

def test_permutation_stack_error
bug9932 = '[ruby-core:63103] [Bug #9932]'
assert_separately([], <<-"end;") # do
assert_separately([], <<-"end;", timeout: 30) # do
assert_nothing_raised(SystemStackError, "#{bug9932}") do
assert_equal(:ok, Array.new(100_000, nil).permutation {break :ok})
end
@@ -1851,8 +1853,10 @@ def test_repeated_permutation

a = @cls[0, 1, 2, 3, 4][1, 4].repeated_permutation(2)
assert_empty(a.reject {|x| !x.include?(0)})
end

assert_separately([], <<-"end;") # do
def test_repeated_permutation_stack_error
assert_separately([], <<-"end;", timeout: 30) # do
assert_nothing_raised(SystemStackError) do
assert_equal(:ok, Array.new(100_000, nil).repeated_permutation(500_000) {break :ok})
end
@@ -1886,8 +1890,10 @@ def test_repeated_combination

a = @cls[0, 1, 2, 3, 4][1, 4].repeated_combination(2)
assert_empty(a.reject {|x| !x.include?(0)})
end

assert_separately([], <<-"end;") # do
def test_repeated_combination_stack_error
assert_separately([], <<-"end;", timeout: 30) # do
assert_nothing_raised(SystemStackError) do
assert_equal(:ok, Array.new(100_000, nil).repeated_combination(500_000) {break :ok})
end