Allow running tests in parallel via gmake

Some of the tests here are horrifically slow due to sleeps,
allow using gmake to run these tests in parallel.  My Core2 Duo
runs "make -j" over 10s faster than "rake".

1 files changed, 8 insertions, 3 deletions

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7da26f8..ab97a9f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,7 +10,6 @@ HERE = File.dirname(__FILE__) unless defined?(HERE)
   $LOAD_PATH.unshift "#{HERE}/../#{dir}"
 end
 
-require 'rubygems'
 require 'test/unit'
 require 'net/http'
 require 'timeout'
@@ -21,6 +20,7 @@ require 'digest/sha1'
 require 'uri'
 require 'stringio'
 require 'pp'
+require 'rubygems'
 
 require 'mongrel'
 
@@ -32,8 +32,13 @@ end
 def redirect_test_io
   orig_err = STDERR.dup
   orig_out = STDOUT.dup
-  STDERR.reopen("test_stderr.log")
-  STDOUT.reopen("test_stdout.log")
+  STDERR.reopen("test_stderr.#{$$}.log")
+  STDOUT.reopen("test_stdout.#{$$}.log")
+
+  at_exit do
+    File.unlink("test_stderr.#{$$}.log") rescue nil
+    File.unlink("test_stdout.#{$$}.log") rescue nil
+  end
 
   begin
     yield