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

Commits on Feb 4, 2016

  1. [Truffle] Don't use -X-T to install gems.

    @chrisseaton
    chrisseaton committed Feb 4, 2016
    Copy the full SHA
    c771529 View commit details

  2. [Truffle] Let integration tests detect JS for themselves.

    @chrisseaton
    chrisseaton committed Feb 4, 2016
    Copy the full SHA
    cb42d92 View commit details
10 changes: 1 addition & 9 deletions test/truffle/integration/execjs.sh
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,7 @@

set -e

# Run with for example JRUBY_OPTS='-J-cp ..../trufflejs.jar'

if [[ $JRUBY_OPTS != *"trufflejs.jar"* ]]
then
echo 'No trufflejs.jar found in $JRUBY_OPTS - skipping ExecJS integration test'
exit 0
fi

bin/jruby -X-T bin/gem install execjs -v 2.6.0
bin/jruby bin/gem install execjs -v 2.6.0
ruby -X+T -Ilib/ruby/gems/shared/gems/execjs-2.6.0/lib test/truffle/integration/execjs/checkruntime.rb
ruby -X+T -Ilib/ruby/gems/shared/gems/execjs-2.6.0/lib test/truffle/integration/execjs/simple.rb
ruby -X+T -Ilib/ruby/gems/shared/gems/execjs-2.6.0/lib test/truffle/integration/execjs/coffeescript.rb
5 changes: 5 additions & 0 deletions test/truffle/integration/execjs/checkruntime.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
unless defined?(Truffle) && Truffle::Interop.mime_type_supported?('application/javascript')
puts "JavaScript doesn't appear to be available - skipping execjs test"
exit
end

require 'execjs'
require 'truffle/execjs'

5 changes: 5 additions & 0 deletions test/truffle/integration/execjs/coffeescript.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
unless defined?(Truffle) && Truffle::Interop.mime_type_supported?('application/javascript')
puts "JavaScript doesn't appear to be available - skipping execjs test"
exit
end

# Example from the ExecJS README.md

# Copyright (c) 2015-2016 Sam Stephenson
5 changes: 5 additions & 0 deletions test/truffle/integration/execjs/simple.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
unless defined?(Truffle) && Truffle::Interop.mime_type_supported?('application/javascript')
puts "JavaScript doesn't appear to be available - skipping execjs test"
exit
end

# Example from the ExecJS README.md

# Copyright (c) 2015-2016 Sam Stephenson
2 changes: 1 addition & 1 deletion test/truffle/integration/rack-server.sh
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@

set -e

bin/jruby -X-T bin/gem install rack -v 1.6.1
bin/jruby bin/gem install rack -v 1.6.1
source test/truffle/integration/common/test_server.sh.inc
ruby -X+T -Ilib/ruby/gems/shared/gems/rack-1.6.1/lib test/truffle/integration/rack-server/rack-server.rb & test_server
8 changes: 4 additions & 4 deletions test/truffle/integration/sinatra-server.sh
View file
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@

set -e

bin/jruby -X-T bin/gem install rack -v 1.6.1
bin/jruby -X-T bin/gem install tilt -v 2.0.1
bin/jruby -X-T bin/gem install rack-protection -v 1.5.3
bin/jruby -X-T bin/gem install sinatra -v 1.4.6
bin/jruby bin/gem install rack -v 1.6.1
bin/jruby bin/gem install tilt -v 2.0.1
bin/jruby bin/gem install rack-protection -v 1.5.3
bin/jruby bin/gem install sinatra -v 1.4.6
source test/truffle/integration/common/test_server.sh.inc
ruby -X+T -Ilib/ruby/gems/shared/gems/rack-1.6.1/lib -Ilib/ruby/gems/shared/gems/tilt-2.0.1/lib -Ilib/ruby/gems/shared/gems/rack-protection-1.5.3/lib -Ilib/ruby/gems/shared/gems/sinatra-1.4.6/lib test/truffle/integration/sinatra-server/sinatra-server.rb & test_server