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

Commits on May 19, 2016

  1. Revert "[Truffle] Temporarily disabled integration test that's only f…

    …ailing in Travis."
    
    This reverts commit cd4a1e6.
    chrisseaton committed May 19, 2016
    Copy the full SHA
    ee1c654 View commit details
  2. Copy the full SHA
    f899dd5 View commit details
3 changes: 2 additions & 1 deletion test/truffle/integration/js/eval.rb
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@
# GNU Lesser General Public License version 2.1

unless Truffle::Interop.mime_type_supported?('application/javascript')
abort 'JavaScript doesn\'t appear to be available - skipping JavaScript test'
puts 'JavaScript doesn\'t appear to be available - skipping JavaScript test'
exit
end

if Truffle::Interop.eval('application/javascript', '14 + 2') != 16
3 changes: 2 additions & 1 deletion test/truffle/integration/js/inline-exported.rb
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@
# GNU Lesser General Public License version 2.1

unless Truffle::Interop.mime_type_supported?('application/javascript')
abort 'JavaScript doesn\'t appear to be available - skipping JavaScript test'
puts 'JavaScript doesn\'t appear to be available - skipping JavaScript test'
exit
end

Truffle::Interop.eval('application/javascript', %{
3 changes: 2 additions & 1 deletion test/truffle/integration/r/eval.rb
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@
# GNU Lesser General Public License version 2.1

unless Truffle::Interop.mime_type_supported?('application/x-r')
abort 'R doesn\'t appear to be available - skipping R test'
puts 'R doesn\'t appear to be available - skipping R test'
exit
end

if Truffle::Interop.eval('application/x-r', '14 + 2') != 16
3 changes: 2 additions & 1 deletion test/truffle/integration/sl/inline-exported.rb
Original file line number Diff line number Diff line change
@@ -7,7 +7,8 @@
# GNU Lesser General Public License version 2.1

unless Truffle::Interop.mime_type_supported?('application/x-sl')
abort 'SL doesn\'t appear to be available - skipping SL test'
puts 'SL doesn\'t appear to be available - skipping SL test'
exit
end

Truffle::Interop.eval('application/x-sl', %{