diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-24 01:38:04 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-24 01:38:04 +0000 |
commit | e518f1dd32c4e72f981a85dd0f0f5168e97541ba (patch) | |
tree | 3223de5ae2f8820e6345129359bfe411464e7af1 | |
parent | 01865d5bc61b5d00e261ff2a0956f50311f454b5 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/test/unit/parallel.rb | 4 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Mon Sep 24 10:37:56 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@ruby-lang.org> * ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb index 7a7c73d4f2..bb95a54f78 100644 --- a/lib/test/unit/parallel.rb +++ b/lib/test/unit/parallel.rb @@ -152,6 +152,10 @@ if $0 == __FILE__ 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 @@ -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" |