kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 54720: [Backport #12184]

Browse source 
* ruby.c: cygwin does not use w32_cmdvector, command line can be
	  other than UTF-8.  [ruby-dev:49519] [Bug #12184]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-04-23 18:23:07 +00:00
parent ab3376b992
commit 7b70f0e22a
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Apr 24 03:05:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c: cygwin does not use w32_cmdvector, command line can be
other than UTF-8. [ruby-dev:49519] [Bug #12184]
Sat Apr 23 01:01:13 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval_jump.c (exec_end_procs_chain): restore previous error info

2
ruby.c
View file

@ -369,7 +369,9 @@ translit_char_bin(char *p, int from, int to)
p++;
}
}
#endif
#ifdef _WIN32
# define UTF8_PATH 1
#endif

13
test/ruby/test_rubyoptions.rb
View file

@ -681,7 +681,8 @@ class TestRubyOptions < Test::Unit::TestCase
end
end
if /mswin|mingw/ =~ RUBY_PLATFORM
case RUBY_PLATFORM
when /mswin|mingw/
def test_command_line_glob_nonascii
bug10555 = '[ruby-dev:48752] [Bug #10555]'
name = "\u{3042}.txt"
@ -718,9 +719,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(["-e", "", "test/*"], "", [], [], bug10941)
end
end
end
if /mswin|mingw/ =~ RUBY_PLATFORM
Ougai = %W[\u{68ee}O\u{5916}.txt \u{68ee 9d0e 5916}.txt \u{68ee 9dd7 5916}.txt]
def test_command_line_glob_noncodepage
with_tmpchdir do |dir|
@ -730,6 +729,14 @@ class TestRubyOptions < Test::Unit::TestCase
assert_in_out_err(["-e", "puts ARGV", "*.txt"], "", ougai)
end
end
when /cygwin/
def test_command_line_non_ascii
assert_separately([{"LC_ALL"=>"ja_JP.SJIS"}, "-", "\u{3042}".encode("SJIS")], <<-"end;")
bug12184 = '[ruby-dev:49519] [Bug #12184]'
a = ARGV[0]
assert_equal([Encoding::SJIS, 130, 160], [a.encoding, *a.bytes], bug12184)
end;
end
end
def test_script_is_directory

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-04-23"
#define RUBY_PATCHLEVEL 106
#define RUBY_RELEASE_DATE "2016-04-24"
#define RUBY_PATCHLEVEL 107
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 23
#define RUBY_RELEASE_DAY 24
#include "ruby/version.h"