Permalink
Browse files

[all] Trying hard to please the CI gods

Previously export RUBYOPT=-Ispec was masking the
fact that "lib" and "spec" dirs weren't added to
rspec's loadpath. This caused rake spec to fail
when RUBYOPT=-Ispec wasn't set
  • Loading branch information...
1 parent e2641b6 commit 2cb2aaba1a4964b73a9e26dd69cda36aafd30531 @snusnu snusnu committed Sep 9, 2009
Showing with 2 additions and 1 deletion.
  1. +1 −1 spec/spec_helper.rb
  2. +1 −0 tasks/spec.rb
View
@@ -4,7 +4,7 @@
require 'dm-core'
# Support running specs with 'rake spec' and 'spec'
-$LOAD_PATH.unshift(File.join('lib'))
+$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
require 'dm-migrations'
require 'dm-migrations/migration_runner'
View
@@ -8,6 +8,7 @@
Spec::Rake::SpecTask.new(:spec) do |t|
t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+ t.libs << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
begin
require 'rcov'

0 comments on commit 2cb2aab

Please sign in to comment.