Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix travis CI build.

- Bundler 1.3 needs rbconfig to be required to run `bin/rspec` after
  installing with `--standalone --binstubs`.
  bundler/bundler#2382
- The Travis VMs no longer have 32-bit JVMs available. Aruba 0.4.11
  forced the -d32 flag. 0.5 just documents it and makes a file available
  to require that will set it. We've updated Aruba here so that the jruby
  ENV vars aren't set automatically; we've kept the flag to disable JIT
  but removed -d32.
  • Loading branch information...
commit a68dfdcd753b79b67034d37a5e815203e929f47b 1 parent 1388883
@myronmarston myronmarston authored
View
7 features/support/env.rb
@@ -3,3 +3,10 @@
Before do
@aruba_timeout_seconds = 15
end
+
+Aruba.configure do |config|
+ config.before_cmd do |cmd|
+ set_env('JRUBY_OPTS', "-X-C #{ENV['JRUBY_OPTS']}") # disable JIT since these processes are so short lived
+ end
+end if RUBY_PLATFORM == 'java'
+
View
2  rspec-expectations.gemspec
@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake', '~> 10.0.0'
s.add_development_dependency 'cucumber', '~> 1.1.9'
- s.add_development_dependency 'aruba', '~> 0.4.11'
+ s.add_development_dependency 'aruba', '~> 0.5'
end
View
3  script/test_all
@@ -6,6 +6,9 @@ echo "Bundling Standalone so we can run the specs w/o bundler loaded"
bundle install --standalone --binstubs
+# Needed by Bundler 1.3: https://github.com/carlhuda/bundler/issues/2382
+export RUBYOPT='-rrbconfig'
+
echo "Running all..."
bin/rspec spec --format progress --profile
Please sign in to comment.
Something went wrong with that request. Please try again.