summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/test/unit/parallel.rb4
-rw-r--r--version.h6
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c076fb9d2..1996590b1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index 959598948c..1f7b08ee2e 100644
--- a/version.h
+++ b/version.h
@@ -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"