Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Truffle] Install gems for testing in one go and then have a configur…
Browse files Browse the repository at this point in the history
…able GEM_HOME
chrisseaton committed Jun 15, 2016
1 parent 5e0a335 commit 6dbb597
Showing 7 changed files with 32 additions and 12 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -84,7 +84,12 @@ matrix:
jdk: oraclejdk8
- env: JT='test integration'
jdk: oraclejdk8
- env: JT='test gems' JAVA_OPTS="$JAVA_OPTS -Xmx512m" HAS_REDIS=true
- env:
- JT='test gems'
- JAVA_OPTS="$JAVA_OPTS -Xmx512m"
- HAS_REDIS=true
- INSTALL_GEMS=true
- GEM_HOME=lib/ruby/gems/shared
jdk: oraclejdk8
- env: JT='test tck'
jdk: oraclejdk8
7 changes: 3 additions & 4 deletions test/truffle/gems/execjs.sh
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@

set -e

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/gems/execjs/checkruntime.rb
ruby -X+T -Ilib/ruby/gems/shared/gems/execjs-2.6.0/lib test/truffle/gems/execjs/simple.rb
ruby -X+T -Ilib/ruby/gems/shared/gems/execjs-2.6.0/lib test/truffle/gems/execjs/coffeescript.rb
ruby -X+T -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/checkruntime.rb
ruby -X+T -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/simple.rb
ruby -X+T -I$GEM_HOME/gems/execjs-2.6.0/lib test/truffle/gems/execjs/coffeescript.rb
2 changes: 2 additions & 0 deletions test/truffle/gems/gem-testing.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

set -e

gem install bundler

mkdir -p test/truffle/gems/gem-testing
9 changes: 9 additions & 0 deletions test/truffle/gems/install-gems.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

set -e

bin/jruby bin/gem install execjs -v 2.6.0
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
3 changes: 1 addition & 2 deletions test/truffle/gems/rack-server.sh
Original file line number Diff line number Diff line change
@@ -2,6 +2,5 @@

set -e

bin/jruby bin/gem install rack -v 1.6.1
source test/truffle/common/test_server.sh.inc
ruby -X+T -Ilib/ruby/gems/shared/gems/rack-1.6.1/lib test/truffle/gems/rack-server/rack-server.rb & test_server
ruby -X+T -I$GEM_HOME/gems/rack-1.6.1/lib test/truffle/gems/rack-server/rack-server.rb & test_server
11 changes: 6 additions & 5 deletions test/truffle/gems/sinatra-server.sh
Original file line number Diff line number Diff line change
@@ -2,9 +2,10 @@

set -e

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/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/gems/sinatra-server/sinatra-server.rb & test_server

ruby -X+T -I$GEM_HOME/gems/rack-1.6.1/lib \
-I$GEM_HOME/gems/tilt-2.0.1/lib \
-I$GEM_HOME/gems/rack-protection-1.5.3/lib \
-I$GEM_HOME/gems/sinatra-1.4.6/lib \
test/truffle/gems/sinatra-server/sinatra-server.rb & test_server
5 changes: 5 additions & 0 deletions tool/travis-install.sh
Original file line number Diff line number Diff line change
@@ -11,6 +11,11 @@ then
chmod +x bin/jruby
fi

if [[ -v INSTALL_GEMS ]]
then
test/truffle/gems/install-gems.sh
fi

if [[ -n "$PHASE" && $JAVA_HOME == *"java-8"* ]]
then
./mvnw $MAVEN_CLI_OPTS package -B --projects '!truffle' -Dinvoker.skip -Dmaven.test.skip;

0 comments on commit 6dbb597

Please sign in to comment.