Browse files

Fix travis CI build.

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...
1 parent 359ff6a commit e7417e155cbb380d5cbb67039948c455cda9b2ca @myronmarston myronmarston committed Mar 11, 2013
Showing with 11 additions and 1 deletion.
  1. +7 −0 features/support/env.rb
  2. +1 −1 rspec-mocks.gemspec
  3. +3 −0 script/test_all
View
7 features/support/env.rb
@@ -4,3 +4,10 @@
Before do
RUBY_PLATFORM =~ /java/ ? @aruba_timeout_seconds = 60 : @aruba_timeout_seconds = 5
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-mocks.gemspec
@@ -23,5 +23,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
@@ -2,6 +2,9 @@
set -e -x
+# Needed by Bundler 1.3: https://github.com/carlhuda/bundler/issues/2382
+export RUBYOPT='-rrbconfig'
+
echo "Bundling Standalone so we can run the specs w/o bundler loaded"
bundle install --standalone --binstubs

0 comments on commit e7417e1

Please sign in to comment.