summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-07-25 12:15:22 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-07-31 21:07:19 +0900
commitdb2047ebaf4d506420432cf18ca978a1fc63a91f (patch)
treecc85d0affd3dc787896f47a2fae3adc7585fe326
parent6c19b0ec6e124be9972e357a0d9080a1c9cbe16e (diff)
[rubygems/rubygems] Fix encoding mismatch errors on MinGW
GNU make in MSys is localized to use UTF-8 while Ruby's filesystem encoding is set to OEM CodePage (e.g., CP932 in Japanese Edition), the read output from the make has broken encoding and results in "invalid byte sequence" errors. As `DESTDIR` is set to a US-ASCII 7bit clean string, matching as binary encoding should have no problems. https://github.com/rubygems/rubygems/commit/96a5e7523b
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3379
-rw-r--r--test/rubygems/test_gem_ext_builder.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb
index f03b009..abd33d2 100644
--- a/test/rubygems/test_gem_ext_builder.rb
+++ b/test/rubygems/test_gem_ext_builder.rb
@@ -47,7 +47,7 @@ install:
Gem::Ext::Builder.make @dest_path, results
end
- results = results.join "\n"
+ results = results.join("\n").b
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$}, results
@@ -78,7 +78,7 @@ install:
Gem::Ext::Builder.make @dest_path, results
end
- results = results.join "\n"
+ results = results.join("\n").b
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}" clean$}, results
assert_match %r{"DESTDIR=#{ENV['DESTDIR']}"$}, results