diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-18 14:51:18 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-18 14:51:18 +0000 |
commit | 1b54468b735723ff13a15ac35f2f86be4181f280 (patch) | |
tree | fd147eca818d0114d4c510dc0e93b57f57d0f94b | |
parent | 1e14391978ea5da3f86d58b664ce91f86fc0694d (diff) |
merge revision(s) r40866:
* test/ruby/envutil.rb (assert_separately): require envutil in the
child process too.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/envutil.rb | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Feb 18 23:48:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * test/ruby/envutil.rb (assert_separately): require envutil in the + child process too. + Tue Feb 18 22:38:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately): diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index b3384234d5..ae9b3d5028 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -1,6 +1,7 @@ # -*- coding: us-ascii -*- require "open3" require "timeout" +require "test/unit" module EnvUtil def rubybin @@ -279,7 +280,7 @@ module Test line ||= loc.lineno end src = <<eom - require 'test/unit';include Test::Unit::Assertions;begin;#{src} + require #{__dir__.dump}'/envutil';include Test::Unit::Assertions;begin;#{src} ensure puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}" end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-18" -#define RUBY_PATCHLEVEL 434 +#define RUBY_PATCHLEVEL 435 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 |