Skip to content

Commit 8392f10

Browse files
committed
set the environment variable from the rake file
1 parent 424cf3b commit 8392f10

18 files changed

+6
-18
lines changed

activerecord/Rakefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ end
5050

5151
t.verbose = true
5252
t.warning = true
53-
t.ruby_opts = ["-r#{File.expand_path('../', __FILE__)}/test/connections/#{adapter}"]
5453
}
5554

5655
task "isolated_test_#{adapter}" do
@@ -67,7 +66,13 @@ end
6766
namespace adapter do
6867
task :test => "test_#{adapter}"
6968
task :isolated_test => "isolated_test_#{adapter}"
69+
70+
# Set the connection environment for the adapter
71+
task :env { ENV['ARCONN'] = adapter }
7072
end
73+
74+
# Make sure the adapter test evaluates the env setting task
75+
task "test_#{adapter}" => "#{adapter}:env"
7176
end
7277

7378
rule '.sqlite3' do |t|

activerecord/test/connections/db2.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/firebird.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/frontbase.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/jdbcderby.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/jdbch2.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/jdbchsqldb.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/jdbcmysql.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/jdbcpostgresql.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

activerecord/test/connections/jdbcsqlite3.rb

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)