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

Commits on Dec 27, 2015

  1. [Truffle] Fix coverage test (lines changed after copyright header add… 

    …ed).
    @chrisseaton
    chrisseaton committed Dec 27, 2015
    Copy the full SHA
    1872cf8 View commit details

  2. [Truffle] Fix coverage test (lines changed after copyright header add… 

    …ed).
    @chrisseaton
    chrisseaton committed Dec 27, 2015
    Copy the full SHA
    c162aeb View commit details

  3. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed Dec 27, 2015
    Copy the full SHA
    90646d8 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 test/truffle/coverage/test.rb
4 changes: 2 additions & 2 deletions test/truffle/coverage/test.rb
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,6 @@
require_relative 'subject.rb'

data = Coverage.result[File.join(File.dirname(__FILE__), 'subject.rb')]
expected = [1, 1, nil, 1, 10, nil, nil, 1, nil, 1, 1, nil, nil, 1, 2, nil, nil, 1, 1, nil, 1]
expected = [nil, nil, nil, nil, nil, nil, nil, nil, 1, 1, nil, 1, 10, nil, nil, 1, nil, 1, 1, nil, nil, 1, 2, nil, nil, 1, 1, nil, 1]

raise 'failed' unless data == expected
raise 'coverage data not as expected' unless data == expected