diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-27 04:16:58 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-27 04:16:58 +0000 |
commit | a663b7bd401491712e9ce4a091a5237bdfcb1cab (patch) | |
tree | 56eb57c051947ae06352858c9b6deb8d44e56f39 | |
parent | 6ebf4fa9e8a0f70df0a88cc7b2b450b3dc844818 (diff) |
merge revision(s) 41600: [Backport #8058]
* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
use ruby in build directory in case ruby is not installed.
[ruby-core:53265] [Bug #8058]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/rubygems/test_gem_installer.rb | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Jun 27 13:16:40 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * test/rubygems/test_gem_installer.rb (test_install_extension_flat): + use ruby in build directory in case ruby is not installed. + [ruby-core:53265] [Bug #8058] + Wed Jun 26 23:05:34 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com> * test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): skip if diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 0f9bfefd0e..4f233f9aab 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1073,6 +1073,7 @@ gem 'other', version CONFIG['CC'] = '$(TOUCH) $@ ||' CONFIG['LDSHARED'] = '$(TOUCH) $@ ||' + $ruby = '#{Gem.ruby}' create_makefile("#{@spec.name}") RUBY @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-27" -#define RUBY_PATCHLEVEL 245 +#define RUBY_PATCHLEVEL 246 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 |