Skip to content

Commit

Permalink
merge revision(s) 856a970:
Browse files Browse the repository at this point in the history
	Get rid of multibyte prefix to tmpdir

	---
	 test/ruby/test_require.rb | 12 ++++++------
	 1 file changed, 6 insertions(+), 6 deletions(-)
  • Loading branch information
nagachika committed Apr 5, 2021
1 parent 59cfa0b commit 6847ee0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions test/ruby/test_require.rb
Original file line number Diff line number Diff line change
Expand Up @@ -368,15 +368,15 @@ def test_load_ospath
bug = '[ruby-list:49994] path in ospath'
base = "test_load\u{3042 3044 3046 3048 304a}".encode(Encoding::Windows_31J)
path = nil
Tempfile.create([base, ".rb"]) do |t|
path = t.path

Dir.mktmpdir do |dir|
path = File.join(dir, base+".rb")
assert_raise_with_message(LoadError, /#{base}/) {
load(File.join(File.dirname(path), base))
load(File.join(dir, base))
}

t.puts "warn 'ok'"
t.close
File.open(path, "w+b") do |t|
t.puts "warn 'ok'"
end
assert_include(path, base)
assert_warn("ok\n", bug) {
assert_nothing_raised(LoadError, bug) {
Expand Down
2 changes: 1 addition & 1 deletion version.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 182
#define RUBY_PATCHLEVEL 183

#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 4
Expand Down

0 comments on commit 6847ee0

Please sign in to comment.