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

Commits on Jul 5, 2016

  1. [Truffle] In tests we need to use the the explicit native versions fr…

    …om cexts
    
    as otherwise we may not notice if the monkey patching doesn't work
    chrisseaton committed Jul 5, 2016
    Copy the full SHA
    5ca020d View commit details
  2. Copy the full SHA
    c36e90d View commit details
Showing with 5 additions and 6 deletions.
  1. +1 −2 test/truffle/cexts/oily_png/test.rb
  2. +3 −4 test/truffle/cexts/psd_native/test.rb
  3. +1 −0 tool/jt.rb
3 changes: 1 addition & 2 deletions test/truffle/cexts/oily_png/test.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'chunky_png'
require 'oily_png'

abort unless OilyPNG::Color.r(0x11223344) == ChunkyPNG::Color.r(0x11223344)
abort unless OilyPNG::Color.r(0x11223344) == 0x11
7 changes: 3 additions & 4 deletions test/truffle/cexts/psd_native/test.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
require 'psd'
require 'psd_native'

module PSDNative::Util
extend self
end

abort unless PSDNative::Util.clamp(40, 10, 90) == PSD::Util.clamp(40, 10, 90)
abort unless PSDNative::Util.clamp(5, 10, 90) == PSD::Util.clamp(5, 10, 90)
abort unless PSDNative::Util.clamp(100, 10, 90) == PSD::Util.clamp(100, 10, 90)
abort unless PSDNative::Util.clamp(40, 10, 90) == 40
abort unless PSDNative::Util.clamp(5, 10, 90) == 10
abort unless PSDNative::Util.clamp(100, 10, 90) == 90
1 change: 1 addition & 0 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -553,6 +553,7 @@ def cextc(cext_dir, *clang_opts)
config_src = config['src']

if config_src.start_with?('$GEM_HOME/')
abort 'You need to set $GEM_HOME' unless ENV['GEM_HOME']
src = Dir[ENV['GEM_HOME'] + config_src['$GEM_HOME'.size..-1]]
else
src = Dir[File.join(cext_dir, config_src)]