Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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.
- Aruba now has a "the file xyz shoudl contain" step.
  • Loading branch information...
commit 295b77aec658e2f8079aaf70da6edfd90bfd41df 1 parent 591061c
@myronmarston myronmarston authored
View
4 features/step_definitions/additional_cli_steps.rb
@@ -31,10 +31,6 @@
step %q{the exit status should be 0}
end
-Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|
- check_file_content(file, partial_content, true)
-end
-
Then /^the backtrace\-normalized output should contain:$/ do |partial_output|
# ruby 1.9 includes additional stuff in the backtrace,
# so we need to normalize it to compare it with our expected output.
View
16 features/support/env.rb
@@ -1,12 +1,12 @@
require 'aruba/cucumber'
Before do
- if RUBY_PLATFORM =~ /java/
- # ideas taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
- set_env('JRUBY_OPTS', '-X-C') # disable JIT since these processes are so short lived
- set_env('JAVA_OPTS', '-d32') # force jRuby to use client JVM for faster startup times
- @aruba_timeout_seconds = 60
- else
- @aruba_timeout_seconds = 10
- end
+ @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-core.gemspec
@@ -25,7 +25,7 @@ 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"
s.add_development_dependency "ZenTest", "~> 4.6"
s.add_development_dependency "nokogiri", "1.5.2"
View
6 script/test_all
@@ -2,9 +2,11 @@
set -e -x
-# ideas taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
+# Needed by Bundler 1.3: https://github.com/carlhuda/bundler/issues/2382
+export RUBYOPT='-rrbconfig'
+
+# idea taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
export JRUBY_OPTS='-X-C' # disable JIT since these processes are so short lived
-export JAVA_OPTS='-d32' # force jRuby to use client JVM for faster startup times
echo "Bundling Standalone so we can run the specs w/o bundler loaded"
Please sign in to comment.
Something went wrong with that request. Please try again.