select the AR adapter through `bin/test`.

7 files changed, 21 insertions, 2 deletions

diff --git a/actionmailer/bin/test b/actionmailer/bin/test
index 2827e79217..404cabba51 100755
--- a/actionmailer/bin/test
+++ b/actionmailer/bin/test
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 COMPONENT_ROOT = File.expand_path("../../", __FILE__)
 require File.expand_path("../tools/test", COMPONENT_ROOT)
+exit Minitest.run(ARGV)
diff --git a/actionpack/bin/test b/actionpack/bin/test
index 2827e79217..404cabba51 100755
--- a/actionpack/bin/test
+++ b/actionpack/bin/test
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 COMPONENT_ROOT = File.expand_path("../../", __FILE__)
 require File.expand_path("../tools/test", COMPONENT_ROOT)
+exit Minitest.run(ARGV)
diff --git a/actionview/bin/test b/actionview/bin/test
index 2827e79217..404cabba51 100755
--- a/actionview/bin/test
+++ b/actionview/bin/test
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 COMPONENT_ROOT = File.expand_path("../../", __FILE__)
 require File.expand_path("../tools/test", COMPONENT_ROOT)
+exit Minitest.run(ARGV)
diff --git a/activemodel/bin/test b/activemodel/bin/test
index 2827e79217..404cabba51 100755
--- a/activemodel/bin/test
+++ b/activemodel/bin/test
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 COMPONENT_ROOT = File.expand_path("../../", __FILE__)
 require File.expand_path("../tools/test", COMPONENT_ROOT)
+exit Minitest.run(ARGV)
diff --git a/activerecord/bin/test b/activerecord/bin/test
index 2827e79217..f8adf2aabc 100755
--- a/activerecord/bin/test
+++ b/activerecord/bin/test
@@ -1,3 +1,19 @@
 #!/usr/bin/env ruby
 COMPONENT_ROOT = File.expand_path("../../", __FILE__)
 require File.expand_path("../tools/test", COMPONENT_ROOT)
+module Minitest
+  def self.plugin_active_record_options(opts, options)
+    opts.separator ""
+    opts.separator "Active Record options:"
+    opts.on("-a", "--adapter [ADAPTER]",
+            "Run tests using a specific adapter (sqlite3, sqlite3_mem, mysql, mysql2, postgresql)") do |adapter|
+      ENV["ARCONN"] = adapter.strip
+    end
+
+    opts
+  end
+end
+
+Minitest.extensions.unshift 'active_record'
+
+exit Minitest.run(ARGV)
diff --git a/activesupport/bin/test b/activesupport/bin/test
index 2827e79217..404cabba51 100755
--- a/activesupport/bin/test
+++ b/activesupport/bin/test
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
 COMPONENT_ROOT = File.expand_path("../../", __FILE__)
 require File.expand_path("../tools/test", COMPONENT_ROOT)
+exit Minitest.run(ARGV)
diff --git a/tools/test.rb b/tools/test.rb
index 1d223f99a2..50cce2081a 100644
--- a/tools/test.rb
+++ b/tools/test.rb
@@ -8,5 +8,3 @@ module Rails
     @root ||= Pathname.new(COMPONENT_ROOT)
   end
 end
-
-exit Minitest.run(ARGV)