[Truffle] Install gems for testing in one go and then have a configur…

…able GEM_HOME
jruby · Jun 15, 2016 · 6dbb597 · 6dbb597
1 parent 5e0a335
commit 6dbb597
Showing 7 changed files with 32 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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

diff --git a/test/truffle/gems/execjs.sh b/test/truffle/gems/execjs.sh
@@ -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
diff --git a/test/truffle/gems/gem-testing.sh b/test/truffle/gems/gem-testing.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 gem install bundler
 
 mkdir -p test/truffle/gems/gem-testing

diff --git a/test/truffle/gems/install-gems.sh b/test/truffle/gems/install-gems.sh
@@ -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
diff --git a/test/truffle/gems/rack-server.sh b/test/truffle/gems/rack-server.sh
@@ -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
diff --git a/test/truffle/gems/sinatra-server.sh b/test/truffle/gems/sinatra-server.sh
@@ -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
diff --git a/tool/travis-install.sh b/tool/travis-install.sh
@@ -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;