1 files changed, 19 insertions, 1 deletions
diff --git a/test/bintest.rb b/test/bintest.rb
index 0ff3341a0..0ef0b4187 100644
--- a/test/bintest.rb
+++ b/test/bintest.rb
@@ -1,8 +1,26 @@
 $:.unshift File.dirname(File.dirname(File.expand_path(__FILE__)))
 require 'test/assert.rb'
 
+def cmd(s)
+  case RbConfig::CONFIG['host_os']
+  when /mswin(?!ce)|mingw|cygwin|bccwin/
+    "bin\\#{s}.exe"
+  else
+    "bin/#{s}"
+  end
+end
+
+def shellquote(s)
+  case RbConfig::CONFIG['host_os']
+  when /mswin(?!ce)|mingw|cygwin|bccwin/
+    "\"#{s}\""
+  else
+    "'#{s}'"
+  end
+end
+
 ARGV.each do |gem|
-  Dir["#{gem}/bintest/*.rb"].each do |file|
+  Dir["#{gem}/bintest/**/*.rb"].each do |file|
     load file
   end
 end