[Truffle] Split test gems and ecosystem, and allow gems to be used fr…

…om somewhere else rather than installing.
jruby · Jun 15, 2016 · 2ed334f · 2ed334f
1 parent 5e0a335
commit 2ed334f
Showing 65 changed files with 70 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -84,11 +84,19 @@ matrix:
       jdk: oraclejdk8
     - env: JT='test integration'
       jdk: oraclejdk8
-    - env: JT='test gems' JAVA_OPTS="$JAVA_OPTS -Xmx512m" HAS_REDIS=true
+    - env:
+      - COMMAND=test/truffle/gems/install-gems.sh
+      - JT='test gems'
+    - env:
+      - JAVA_OPTS="$JAVA_OPTS -Xmx512m"
+      - HAS_REDIS=true
+      - JT='test ecosystem'
       jdk: oraclejdk8
     - env: JT='test tck'
       jdk: oraclejdk8
-    - env: JT=check_ambiguous_arguments SKIP_BUILD=true
+    - env:
+      - JT=check_ambiguous_arguments
+      - SKIP_BUILD=true
       jdk: oraclejdk8
     - env:
       - USE_BUILD_PACK=yes

diff --git a/test/truffle/ecosystem/ecosystem.sh b/test/truffle/ecosystem/ecosystem.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+
+gem install bundler
+
+mkdir -p test/truffle/ecosystem/gem-testing
+jruby+truffle --dir test/truffle/ecosystem/gem-testing ci --batch lib/ruby/truffle/jruby+truffle/gem_ci/travis.txt
diff --git a/test/truffle/gems/rails-app.sh → test/truffle/ecosystem/rails-app.sh b/test/truffle/gems/rails-app.sh → test/truffle/ecosystem/rails-app.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-cd test/truffle/gems/rails-app
+cd test/truffle/ecosystem/rails-app
 
 JRUBY_BIN=../../../../bin
 JRUBY=$JRUBY_BIN/jruby

diff --git a/test/truffle/gems/rails-app/.gitignore → test/truffle/ecosystem/rails-app/.gitignore b/test/truffle/gems/rails-app/.gitignore → test/truffle/ecosystem/rails-app/.gitignore
diff --git a/...ruffle/gems/rails-app/.jruby+truffle.yaml → ...e/ecosystem/rails-app/.jruby+truffle.yaml b/...ruffle/gems/rails-app/.jruby+truffle.yaml → ...e/ecosystem/rails-app/.jruby+truffle.yaml
diff --git a/test/truffle/gems/rails-app/Gemfile → test/truffle/ecosystem/rails-app/Gemfile b/test/truffle/gems/rails-app/Gemfile → test/truffle/ecosystem/rails-app/Gemfile
diff --git a/test/truffle/gems/rails-app/Gemfile.lock → .../truffle/ecosystem/rails-app/Gemfile.lock b/test/truffle/gems/rails-app/Gemfile.lock → .../truffle/ecosystem/rails-app/Gemfile.lock
diff --git a/test/truffle/gems/rails-app/Rakefile → test/truffle/ecosystem/rails-app/Rakefile b/test/truffle/gems/rails-app/Rakefile → test/truffle/ecosystem/rails-app/Rakefile
diff --git a/...le/gems/rails-app/app/assets/images/.keep → ...osystem/rails-app/app/assets/images/.keep b/...le/gems/rails-app/app/assets/images/.keep → ...osystem/rails-app/app/assets/images/.keep
diff --git a/...pp/app/assets/stylesheets/application.css → ...pp/app/assets/stylesheets/application.css b/...pp/app/assets/stylesheets/application.css → ...pp/app/assets/stylesheets/application.css
diff --git a/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/.../rails-app/app/controllers/concerns/.keep → .../rails-app/app/controllers/concerns/.keep b/.../rails-app/app/controllers/concerns/.keep → .../rails-app/app/controllers/concerns/.keep
diff --git a/...-app/app/controllers/people_controller.rb → ...-app/app/controllers/people_controller.rb b/...-app/app/controllers/people_controller.rb → ...-app/app/controllers/people_controller.rb
diff --git a/...ils-app/app/helpers/application_helper.rb → ...ils-app/app/helpers/application_helper.rb b/...ils-app/app/helpers/application_helper.rb → ...ils-app/app/helpers/application_helper.rb
diff --git a/.../gems/rails-app/app/models/concerns/.keep → ...ystem/rails-app/app/models/concerns/.keep b/.../gems/rails-app/app/models/concerns/.keep → ...ystem/rails-app/app/models/concerns/.keep
diff --git a/...uffle/gems/rails-app/app/models/person.rb → .../ecosystem/rails-app/app/models/person.rb b/...uffle/gems/rails-app/app/models/person.rb → .../ecosystem/rails-app/app/models/person.rb
diff --git a/...pp/app/views/layouts/application.html.erb → ...pp/app/views/layouts/application.html.erb b/...pp/app/views/layouts/application.html.erb → ...pp/app/views/layouts/application.html.erb
diff --git a/...gems/rails-app/app/views/people/index.erb → ...stem/rails-app/app/views/people/index.erb b/...gems/rails-app/app/views/people/index.erb → ...stem/rails-app/app/views/people/index.erb
diff --git a/test/truffle/gems/rails-app/bin/bundle → test/truffle/ecosystem/rails-app/bin/bundle b/test/truffle/gems/rails-app/bin/bundle → test/truffle/ecosystem/rails-app/bin/bundle
diff --git a/test/truffle/gems/rails-app/bin/rails → test/truffle/ecosystem/rails-app/bin/rails b/test/truffle/gems/rails-app/bin/rails → test/truffle/ecosystem/rails-app/bin/rails
diff --git a/test/truffle/gems/rails-app/bin/rake → test/truffle/ecosystem/rails-app/bin/rake b/test/truffle/gems/rails-app/bin/rake → test/truffle/ecosystem/rails-app/bin/rake
diff --git a/test/truffle/gems/rails-app/bin/setup → test/truffle/ecosystem/rails-app/bin/setup b/test/truffle/gems/rails-app/bin/setup → test/truffle/ecosystem/rails-app/bin/setup
diff --git a/test/truffle/gems/rails-app/config.ru → test/truffle/ecosystem/rails-app/config.ru b/test/truffle/gems/rails-app/config.ru → test/truffle/ecosystem/rails-app/config.ru
diff --git a/...ffle/gems/rails-app/config/application.rb → ...ecosystem/rails-app/config/application.rb b/...ffle/gems/rails-app/config/application.rb → ...ecosystem/rails-app/config/application.rb
diff --git a/test/truffle/gems/rails-app/config/boot.rb → ...ruffle/ecosystem/rails-app/config/boot.rb b/test/truffle/gems/rails-app/config/boot.rb → ...ruffle/ecosystem/rails-app/config/boot.rb
diff --git a/...ruffle/gems/rails-app/config/database.yml → ...e/ecosystem/rails-app/config/database.yml b/...ruffle/gems/rails-app/config/database.yml → ...e/ecosystem/rails-app/config/database.yml
diff --git a/...ffle/gems/rails-app/config/environment.rb → ...ecosystem/rails-app/config/environment.rb b/...ffle/gems/rails-app/config/environment.rb → ...ecosystem/rails-app/config/environment.rb
diff --git a/...ls-app/config/environments/development.rb → ...ls-app/config/environments/development.rb b/...ls-app/config/environments/development.rb → ...ls-app/config/environments/development.rb
diff --git a/...ils-app/config/environments/production.rb → ...ils-app/config/environments/production.rb b/...ils-app/config/environments/production.rb → ...ils-app/config/environments/production.rb
diff --git a/...ems/rails-app/config/environments/test.rb → ...tem/rails-app/config/environments/test.rb b/...ems/rails-app/config/environments/test.rb → ...tem/rails-app/config/environments/test.rb
diff --git a/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb b/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
diff --git a/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb b/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb
diff --git a/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb b/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb
diff --git a/...ls-app/config/initializers/inflections.rb → ...ls-app/config/initializers/inflections.rb b/...ls-app/config/initializers/inflections.rb → ...ls-app/config/initializers/inflections.rb
diff --git a/...ils-app/config/initializers/mime_types.rb → ...ils-app/config/initializers/mime_types.rb b/...ils-app/config/initializers/mime_types.rb → ...ils-app/config/initializers/mime_types.rb
diff --git a/...-app/config/initializers/session_store.rb → ...-app/config/initializers/session_store.rb b/...-app/config/initializers/session_store.rb → ...-app/config/initializers/session_store.rb
diff --git a/...pp/config/initializers/wrap_parameters.rb → ...pp/config/initializers/wrap_parameters.rb b/...pp/config/initializers/wrap_parameters.rb → ...pp/config/initializers/wrap_parameters.rb
diff --git a/...ffle/gems/rails-app/config/locales/en.yml → ...ecosystem/rails-app/config/locales/en.yml b/...ffle/gems/rails-app/config/locales/en.yml → ...ecosystem/rails-app/config/locales/en.yml
diff --git a/test/truffle/gems/rails-app/config/routes.rb → ...ffle/ecosystem/rails-app/config/routes.rb b/test/truffle/gems/rails-app/config/routes.rb → ...ffle/ecosystem/rails-app/config/routes.rb
diff --git a/...truffle/gems/rails-app/config/secrets.yml → ...le/ecosystem/rails-app/config/secrets.yml b/...truffle/gems/rails-app/config/secrets.yml → ...le/ecosystem/rails-app/config/secrets.yml
diff --git a/test/truffle/gems/rails-app/lib/assets/.keep → ...ffle/ecosystem/rails-app/lib/assets/.keep b/test/truffle/gems/rails-app/lib/assets/.keep → ...ffle/ecosystem/rails-app/lib/assets/.keep
diff --git a/test/truffle/gems/rails-app/lib/tasks/.keep → ...uffle/ecosystem/rails-app/lib/tasks/.keep b/test/truffle/gems/rails-app/lib/tasks/.keep → ...uffle/ecosystem/rails-app/lib/tasks/.keep
diff --git a/test/truffle/gems/rails-app/log/.keep → test/truffle/ecosystem/rails-app/log/.keep b/test/truffle/gems/rails-app/log/.keep → test/truffle/ecosystem/rails-app/log/.keep
diff --git a/test/truffle/gems/rails-app/public/404.html → ...uffle/ecosystem/rails-app/public/404.html b/test/truffle/gems/rails-app/public/404.html → ...uffle/ecosystem/rails-app/public/404.html
diff --git a/test/truffle/gems/rails-app/public/422.html → ...uffle/ecosystem/rails-app/public/422.html b/test/truffle/gems/rails-app/public/422.html → ...uffle/ecosystem/rails-app/public/422.html
diff --git a/test/truffle/gems/rails-app/public/500.html → ...uffle/ecosystem/rails-app/public/500.html b/test/truffle/gems/rails-app/public/500.html → ...uffle/ecosystem/rails-app/public/500.html
diff --git a/...truffle/gems/rails-app/public/favicon.ico → ...le/ecosystem/rails-app/public/favicon.ico b/...truffle/gems/rails-app/public/favicon.ico → ...le/ecosystem/rails-app/public/favicon.ico
diff --git a/.../truffle/gems/rails-app/public/robots.txt → ...fle/ecosystem/rails-app/public/robots.txt b/.../truffle/gems/rails-app/public/robots.txt → ...fle/ecosystem/rails-app/public/robots.txt
diff --git a/...ls-app/public/stylesheets/application.css → ...ls-app/public/stylesheets/application.css b/...ls-app/public/stylesheets/application.css → ...ls-app/public/stylesheets/application.css
diff --git a/...ems/rails-app/public/stylesheets/kube.css → ...tem/rails-app/public/stylesheets/kube.css b/...ems/rails-app/public/stylesheets/kube.css → ...tem/rails-app/public/stylesheets/kube.css
diff --git a/...fle/gems/rails-app/test/controllers/.keep → ...cosystem/rails-app/test/controllers/.keep b/...fle/gems/rails-app/test/controllers/.keep → ...cosystem/rails-app/test/controllers/.keep
diff --git a/...ruffle/gems/rails-app/test/fixtures/.keep → ...e/ecosystem/rails-app/test/fixtures/.keep b/...ruffle/gems/rails-app/test/fixtures/.keep → ...e/ecosystem/rails-app/test/fixtures/.keep
diff --git a/...truffle/gems/rails-app/test/helpers/.keep → ...le/ecosystem/rails-app/test/helpers/.keep b/...truffle/gems/rails-app/test/helpers/.keep → ...le/ecosystem/rails-app/test/helpers/.keep
diff --git a/...fle/gems/rails-app/test/integration/.keep → ...cosystem/rails-app/test/integration/.keep b/...fle/gems/rails-app/test/integration/.keep → ...cosystem/rails-app/test/integration/.keep
diff --git a/...truffle/gems/rails-app/test/mailers/.keep → ...le/ecosystem/rails-app/test/mailers/.keep b/...truffle/gems/rails-app/test/mailers/.keep → ...le/ecosystem/rails-app/test/mailers/.keep
diff --git a/.../truffle/gems/rails-app/test/models/.keep → ...fle/ecosystem/rails-app/test/models/.keep b/.../truffle/gems/rails-app/test/models/.keep → ...fle/ecosystem/rails-app/test/models/.keep
diff --git a/...ruffle/gems/rails-app/test/test_helper.rb → ...e/ecosystem/rails-app/test/test_helper.rb b/...ruffle/gems/rails-app/test/test_helper.rb → ...e/ecosystem/rails-app/test/test_helper.rb
diff --git a/...rails-app/vendor/assets/javascripts/.keep → ...rails-app/vendor/assets/javascripts/.keep b/...rails-app/vendor/assets/javascripts/.keep → ...rails-app/vendor/assets/javascripts/.keep
diff --git a/...rails-app/vendor/assets/stylesheets/.keep → ...rails-app/vendor/assets/stylesheets/.keep b/...rails-app/vendor/assets/stylesheets/.keep → ...rails-app/vendor/assets/stylesheets/.keep
diff --git a/test/truffle/gems/execjs.sh b/test/truffle/gems/execjs.sh
@@ -2,7 +2,8 @@
 
 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
+GEM_HOME=${GEM_HOME:-lib/ruby/gems/shared}
+
+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
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,8 @@
 
 set -e
 
-bin/jruby bin/gem install rack -v 1.6.1
+GEM_HOME=${GEM_HOME:-lib/ruby/gems/shared}
+
 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,12 @@
 
 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
+GEM_HOME=${GEM_HOME:-lib/ruby/gems/shared}
+
 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/jt.rb b/tool/jt.rb
@@ -397,7 +397,8 @@ def help
     puts '    --no-java-cmd   don\'t set JAVACMD - rely on bin/jruby or RUBY_BIN to have Graal already'
     puts 'jt test integration                            runs all integration tests'
     puts 'jt test integration TESTS                      runs the given integration tests'
-    puts 'jt test gems                                   tests installing and using gems'
+    puts 'jt test gems                                   tests using gems'
+    puts 'jt test ecosystem                              tests using the wider ecosystem such as bundler, Rails, etc'
     puts 'jt test cexts                                  run C extension tests (set SULONG_DIR)'
     puts 'jt test report :language                       build a report on language specs'
     puts '               :core                               (results go into test/target/mspec-html-report)'
@@ -562,14 +563,16 @@ def test(*args)
       test_specs('run')
       # test_mri # TODO (pitr-ch 29-Mar-2016): temporarily disabled since it uses refinements
       test_integration
-      test_gems('HAS_REDIS' => 'true')
+      test_gems
+      test_ecosystem 'HAS_REDIS' => 'true'
       test_compiler
       test_cexts if ENV['SULONG_DIR']
     when 'compiler' then test_compiler(*rest)
     when 'cexts' then test_cexts(*rest)
     when 'report' then test_report(*rest)
     when 'integration' then test_integration({}, *rest)
     when 'gems' then test_gems({}, *rest)
+    when 'ecosystem' then test_ecosystem({}, *rest)
     when 'specs' then test_specs('run', *rest)
     when 'tck' then
       args = []
@@ -694,11 +697,31 @@ def test_gems(env={}, *args)
     test_names             = single_test ? '{' + args.join(',') + '}' : '*'
 
     Dir["#{tests_path}/#{test_names}.sh"].each do |test_script|
+      next if test_script.end_with?('/install_gems.sh')
       sh env_vars, test_script
     end
   end
   private :test_gems
 
+  def test_ecosystem(env={}, *args)
+    env_vars   = env
+    jruby_opts = []
+
+    jruby_opts << '-Xtruffle.graal.warn_unless=false'
+
+    env_vars["JRUBY_OPTS"] = jruby_opts.join(' ')
+
+    env_vars["PATH"]       = "#{Utilities.find_jruby_bin_dir}:#{ENV["PATH"]}"
+    tests_path             = "#{JRUBY_DIR}/test/truffle/ecosystem"
+    single_test            = !args.empty?
+    test_names             = single_test ? '{' + args.join(',') + '}' : '*'
+
+    Dir["#{tests_path}/#{test_names}.sh"].each do |test_script|
+      sh env_vars, test_script
+    end
+  end
+  private :test_ecosystem
+
   def test_specs(command, *args)
     env_vars = {}
     options = []