Skip to content

Commit a663b7b

Browse files
committed
merge revision(s) 41600: [Backport ruby#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 ruby#8058] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 6ebf4fa commit a663b7b

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Thu Jun 27 13:16:40 2013 Hiroshi Shirosaki <[email protected]>
2+
3+
* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
4+
use ruby in build directory in case ruby is not installed.
5+
[ruby-core:53265] [Bug #8058]
6+
17
Wed Jun 26 23:05:34 2013 Hiroshi Shirosaki <[email protected]>
28

39
* test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): skip if

test/rubygems/test_gem_installer.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,6 +1073,7 @@ def test_install_extension_flat
10731073
10741074
CONFIG['CC'] = '$(TOUCH) $@ ||'
10751075
CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
1076+
$ruby = '#{Gem.ruby}'
10761077
10771078
create_makefile("#{@spec.name}")
10781079
RUBY

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.0.0"
22
#define RUBY_RELEASE_DATE "2013-06-27"
3-
#define RUBY_PATCHLEVEL 245
3+
#define RUBY_PATCHLEVEL 246
44

55
#define RUBY_RELEASE_YEAR 2013
66
#define RUBY_RELEASE_MONTH 6

0 commit comments

Comments
 (0)