set the environment variable from the rake file

dalibor · Jun 6, 2011 · 8392f10 · 8392f10
1 parent 424cf3b
commit 8392f10
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 18 deletions.
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
@@ -50,7 +50,6 @@ end
 
     t.verbose = true
     t.warning = true
-    t.ruby_opts = ["-r#{File.expand_path('../', __FILE__)}/test/connections/#{adapter}"]
   }
 
   task "isolated_test_#{adapter}" do
@@ -67,7 +66,13 @@ end
   namespace adapter do
     task :test => "test_#{adapter}"
     task :isolated_test => "isolated_test_#{adapter}"
+
+    # Set the connection environment for the adapter
+    task :env { ENV['ARCONN'] = adapter }
   end
+
+  # Make sure the adapter test evaluates the env setting task
+  task "test_#{adapter}" => "#{adapter}:env"
 end
 
 rule '.sqlite3' do |t|

diff --git a/activerecord/test/connections/db2.rb b/activerecord/test/connections/db2.rb
diff --git a/activerecord/test/connections/firebird.rb b/activerecord/test/connections/firebird.rb
diff --git a/activerecord/test/connections/frontbase.rb b/activerecord/test/connections/frontbase.rb
diff --git a/activerecord/test/connections/jdbcderby.rb b/activerecord/test/connections/jdbcderby.rb
diff --git a/activerecord/test/connections/jdbch2.rb b/activerecord/test/connections/jdbch2.rb
diff --git a/activerecord/test/connections/jdbchsqldb.rb b/activerecord/test/connections/jdbchsqldb.rb
diff --git a/activerecord/test/connections/jdbcmysql.rb b/activerecord/test/connections/jdbcmysql.rb
diff --git a/activerecord/test/connections/jdbcpostgresql.rb b/activerecord/test/connections/jdbcpostgresql.rb
diff --git a/activerecord/test/connections/jdbcsqlite3.rb b/activerecord/test/connections/jdbcsqlite3.rb
diff --git a/activerecord/test/connections/mysql.rb b/activerecord/test/connections/mysql.rb
diff --git a/activerecord/test/connections/mysql2.rb b/activerecord/test/connections/mysql2.rb
diff --git a/activerecord/test/connections/openbase.rb b/activerecord/test/connections/openbase.rb
diff --git a/activerecord/test/connections/oracle.rb b/activerecord/test/connections/oracle.rb
diff --git a/activerecord/test/connections/postgresql.rb b/activerecord/test/connections/postgresql.rb
diff --git a/activerecord/test/connections/sqlite3.rb b/activerecord/test/connections/sqlite3.rb
diff --git a/activerecord/test/connections/sqlite3_mem.rb b/activerecord/test/connections/sqlite3_mem.rb
diff --git a/activerecord/test/connections/sybase.rb b/activerecord/test/connections/sybase.rb