naruse	2012-09-24 10:38:04 +0900 (Mon, 24 Sep 2012)

  New Revision: 37021

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37021

  Log:
    merge revision(s) 36247: [Backport #7014]
    
    * lib/test/unit/parallel.rb: workaround fix for rubygems.
      RubyGems can't find rake if the source directory is not equal to
      the directory which is running the test. [Bug #6604]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/test/unit/parallel.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37020)
+++ ruby_1_9_3/ChangeLog	(revision 37021)
@@ -1,3 +1,9 @@
+Mon Sep 24 10:37:56 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/test/unit/parallel.rb: workaround fix for rubygems.
+	  RubyGems can't find rake if the source directory is not equal to
+	  the directory which is running the test. [Bug #6604]
+
 Fri Sep 21 19:53:38 2012  NAKAMURA Usaku  <usa@r...>
 
 	* ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to
Index: ruby_1_9_3/lib/test/unit/parallel.rb
===================================================================
--- ruby_1_9_3/lib/test/unit/parallel.rb	(revision 37020)
+++ ruby_1_9_3/lib/test/unit/parallel.rb	(revision 37021)
@@ -152,6 +152,10 @@
       end
     end
   end
+  require 'rubygems'
+  class Gem::TestCase < MiniTest::Unit::TestCase
+    @@project_dir = File.expand_path('../../../..', __FILE__)
+  end
 
   Test::Unit::Worker.new.run(ARGV)
 end
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37020)
+++ ruby_1_9_3/version.h	(revision 37021)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 273
+#define RUBY_PATCHLEVEL 274
 
-#define RUBY_RELEASE_DATE "2012-09-21"
+#define RUBY_RELEASE_DATE "2012-09-24"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/