From ce02265d59af720e38cdade0c90f50b0408f27a8 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 20 Mar 2021 16:04:02 +0900 Subject: merge revision(s) 0dc95266e8c36dbc3bfdcb88d820cb7f897166d7: Fix the failing test with XDG_CONFIG_HOME --- test/irb/test_init.rb | 4 ++++ 1 file changed, 4 insertions(+) --- test/irb/test_init.rb | 4 ++++ version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/irb/test_init.rb b/test/irb/test_init.rb index b51d01096d..83b4b5a543 100644 --- a/test/irb/test_init.rb +++ b/test/irb/test_init.rb @@ -21,6 +21,7 @@ module TestIRB def test_rc_file backup_irbrc = ENV.delete("IRBRC") # This is for RVM... + backup_xdg_config_home = ENV.delete("XDG_CONFIG_HOME") backup_home = ENV["HOME"] Dir.mktmpdir("test_irb_init_#{$$}") do |tmpdir| ENV["HOME"] = tmpdir @@ -35,11 +36,13 @@ module TestIRB end ensure ENV["HOME"] = backup_home + ENV["XDG_CONFIG_HOME"] = backup_xdg_config_home ENV["IRBRC"] = backup_irbrc end def test_rc_file_in_subdir backup_irbrc = ENV.delete("IRBRC") # This is for RVM... + backup_xdg_config_home = ENV.delete("XDG_CONFIG_HOME") backup_home = ENV["HOME"] Dir.mktmpdir("test_irb_init_#{$$}") do |tmpdir| ENV["HOME"] = tmpdir @@ -57,6 +60,7 @@ module TestIRB end ensure ENV["HOME"] = backup_home + ENV["XDG_CONFIG_HOME"] = backup_xdg_config_home ENV["IRBRC"] = backup_irbrc end diff --git a/version.h b/version.h index 9e8f82a10e..bf6b906e6c 100644 --- a/version.h +++ b/version.h @@ -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 174 +#define RUBY_PATCHLEVEL 175 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 3 -- cgit v1.2.3