From 0c00fb5d92dbd87bfdde393d1e3bece9b457d17c Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 25 Jun 2023 12:37:14 +0900 Subject: [PATCH] merge revision(s) ec14861f0d7a1e99d3e6667dee2f4c9cc426d5f3: Update to ruby/spec@7e680fa --- spec/ruby/core/dir/home_spec.rb | 5 +++-- spec/ruby/core/process/spawn_spec.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) --- spec/ruby/core/dir/home_spec.rb | 5 +++-- spec/ruby/core/process/spawn_spec.rb | 2 +- version.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb index 95bb00ad03..bbe347ba9e 100644 --- a/spec/ruby/core/dir/home_spec.rb +++ b/spec/ruby/core/dir/home_spec.rb @@ -33,7 +33,7 @@ describe "Dir.home" do end platform_is :windows do - ruby_version_is "3.0" do + ruby_version_is "3.2" do it "returns the home directory with forward slashs and as UTF-8" do ENV['HOME'] = "C:\\rubyspäc\\home" home = Dir.home @@ -50,7 +50,8 @@ describe "Dir.home" do ENV['HOMEPATH'] = "\\rubyspec\\home1" Dir.home.should == "C:/rubyspec/home1" ENV['USERPROFILE'] = "C:\\rubyspec\\home2" - Dir.home.should == "C:/rubyspec/home2" + # https://bugs.ruby-lang.org/issues/19244 + # Dir.home.should == "C:/rubyspec/home2" ENV['HOME'] = "C:\\rubyspec\\home3" Dir.home.should == "C:/rubyspec/home3" ensure diff --git a/spec/ruby/core/process/spawn_spec.rb b/spec/ruby/core/process/spawn_spec.rb index 7a280ccdf4..c8a58c4d04 100644 --- a/spec/ruby/core/process/spawn_spec.rb +++ b/spec/ruby/core/process/spawn_spec.rb @@ -482,7 +482,7 @@ describe "Process.spawn" do -> do wrapped_io = mock('wrapped IO') wrapped_io.should_receive(:to_io).and_return(file) - Process.wait Process.spawn('echo "Hello World"', out: wrapped_io) + Process.wait Process.spawn('echo Hello World', out: wrapped_io) end.should output_to_fd("Hello World\n", file) end end diff --git a/version.h b/version.h index 3efe8f06d7..a5b57b2ca9 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 2 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 57 +#define RUBY_PATCHLEVEL 58 #include "ruby/version.h" #include "ruby/internal/abi.h"