aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-11 12:19:40 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-11 12:20:03 +0900
commit390293525a8c8564c62f7691414194705a193b40 (patch)
treebf9e4473a4707c92d21d81cfdb47f03684af01a6
parent6f9be8505d172b110ec449478a791d70b9b74afb (diff)
downloadruby-390293525a8c8564c62f7691414194705a193b40.tar.gz
Remove binary data at installation
And revert "Relaxed warning assertions", 6f9be8505d172b110ec449478a791d70b9b74afb.
-rw-r--r--test/rubygems/test_require.rb8
-rwxr-xr-xtool/rbinstall.rb2
2 files changed, 5 insertions, 5 deletions
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 8972b6c290..1590c04d21 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -509,11 +509,11 @@ class TestGemRequire < Gem::TestCase
_, err = capture_subprocess_io do
system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
end
- assert_includes err, "main.rb:1: warning: uplevel\ntest\n"
+ assert_equal "main.rb:1: warning: uplevel\ntest\n", err
_, err = capture_subprocess_io do
system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
end
- assert_includes err, "main.rb:1: warning: uplevel\ntest\n"
+ assert_equal "main.rb:1: warning: uplevel\ntest\n", err
end
end
@@ -524,11 +524,11 @@ class TestGemRequire < Gem::TestCase
_, err = capture_subprocess_io do
system(@@ruby, "-w", "-rpp", "--disable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
end
- assert_includes err, "{:x=>1}\n{:y=>2}\n"
+ assert_equal "{:x=>1}\n{:y=>2}\n", err
_, err = capture_subprocess_io do
system(@@ruby, "-w", "-rpp", "--enable=gems", "-I", lib, "-C", dir, "-I.", "main.rb")
end
- assert_includes err, "{:x=>1}\n{:y=>2}\n"
+ assert_equal "{:x=>1}\n{:y=>2}\n", err
end
end
end
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 0475901646..28fa95e51c 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -838,7 +838,7 @@ def install_default_gem(dir, srcdir)
puts "#{INDENT}#{gemspec.name} #{gemspec.version}"
gemspec_path = File.join(default_spec_dir, "#{full_name}.gemspec")
open_for_install(gemspec_path, $data_mode) do
- gemspec.to_ruby
+ gemspec.to_ruby.gsub(/.*\0.*\n/, '')
end
specific_gem_dir = File.join(gem_dir, 'gems', full_name)