From 80451a1fa60f4efa74f2d0e61682441625c7b51e Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Mon, 6 Jun 2011 18:01:11 -0700 Subject: [PATCH] make sure AR isolated tests set the environment variable --- activerecord/Rakefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 71200abf69..d769a73dba 100755 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -59,7 +59,7 @@ end (Dir["test/cases/**/*_test.rb"].reject { |x| x =~ /\/adapters\// } + Dir["test/cases/adapters/#{adapter_short}/**/*_test.rb"]).all? do |file| - sh(ruby, "-Itest", "-r#{File.expand_path('../', __FILE__)}/test/connections/#{adapter}", file) + sh(ruby, "-Itest", file) end or raise "Failures" end @@ -73,6 +73,7 @@ end # Make sure the adapter test evaluates the env setting task task "test_#{adapter}" => "#{adapter}:env" + task "isolated_test_#{adapter}" => "#{adapter}:env" end rule '.sqlite3' do |t|