diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-28 13:55:46 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-28 13:55:46 -0700 |
| commit | 586173204c4cff94c479518e3e9b58ef4790a764 (patch) | |
| tree | 47c0620da614089dc45143325e70ec4263015f90 /activerecord | |
| parent | 953b577f4378df06234d7e7ff409baa4d55890e8 (diff) | |
| parent | f52832de2ad67c4489b094d362425cf66ab29ced (diff) | |
| download | rails-586173204c4cff94c479518e3e9b58ef4790a764.tar.gz rails-586173204c4cff94c479518e3e9b58ef4790a764.tar.bz2 rails-586173204c4cff94c479518e3e9b58ef4790a764.zip | |
Merge pull request #11608 from arunagw/ruby-from-rubygems
grab executable from rubygems
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/Rakefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/Rakefile b/activerecord/Rakefile index ad5372ed50..cee1dd5aeb 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -58,11 +58,10 @@ end task "isolated_test_#{adapter}" do adapter_short = adapter == 'db2' ? adapter : adapter[/^[a-z0-9]+/] puts [adapter, adapter_short].inspect - ruby = File.join(*RbConfig::CONFIG.values_at('bindir', 'RUBY_INSTALL_NAME')) (Dir["test/cases/**/*_test.rb"].reject { |x| x =~ /\/adapters\// } + Dir["test/cases/adapters/#{adapter_short}/**/*_test.rb"]).all? do |file| - sh(ruby, '-w' ,"-Itest", file) + sh(Gem.ruby, '-w' ,"-Itest", file) end or raise "Failures" end |