kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix spec/ruby/command_line/rubylib_spec.rb for use with make test-spec

Browse source 
* Current code clears ENV['RUBYLIB'], but on Windows it's needed when
  running from build 'src' (or running make test-spec).
* Patch by MSP-Greg, from https://github.com/ruby/spec/pull/607.
* Imported manually to fix CI on Windows, without needing a full sync.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eregon 2018-06-30 13:53:10 +00:00
parent 7b230cfe28
commit 5235d57b07
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
spec/ruby/command_line/rubylib_spec.rb
View file

@ -3,6 +3,7 @@ require_relative '../spec_helper'
describe "The RUBYLIB environment variable" do describe "The RUBYLIB environment variable" do
before :each do before :each do
@rubylib, ENV["RUBYLIB"] = ENV["RUBYLIB"], nil @rubylib, ENV["RUBYLIB"] = ENV["RUBYLIB"], nil
@pre = @rubylib.nil? ? '' : @rubylib + File::PATH_SEPARATOR
end end
after :each do after :each do
@ -11,14 +12,14 @@ describe "The RUBYLIB environment variable" do
it "adds a directory to $LOAD_PATH" do it "adds a directory to $LOAD_PATH" do
dir = tmp("rubylib/incl") dir = tmp("rubylib/incl")
ENV["RUBYLIB"] = dir ENV["RUBYLIB"] = @pre + dir
paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp) paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
paths.should include(dir) paths.should include(dir)
end end
it "adds a File::PATH_SEPARATOR-separated list of directories to $LOAD_PATH" do it "adds a File::PATH_SEPARATOR-separated list of directories to $LOAD_PATH" do
dir1, dir2 = tmp("rubylib/incl1"), tmp("rubylib/incl2") dir1, dir2 = tmp("rubylib/incl1"), tmp("rubylib/incl2")
ENV["RUBYLIB"] = "#{dir1}#{File::PATH_SEPARATOR}#{dir2}" ENV["RUBYLIB"] = @pre + "#{dir1}#{File::PATH_SEPARATOR}#{dir2}"
paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp) paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
paths.should include(dir1) paths.should include(dir1)
paths.should include(dir2) paths.should include(dir2)
@ -27,7 +28,7 @@ describe "The RUBYLIB environment variable" do
it "adds the directory at the front of $LOAD_PATH" do it "adds the directory at the front of $LOAD_PATH" do
dir = tmp("rubylib/incl_front") dir = tmp("rubylib/incl_front")
ENV["RUBYLIB"] = dir ENV["RUBYLIB"] = @pre + dir
paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp) paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
if PlatformGuard.implementation? :ruby if PlatformGuard.implementation? :ruby
# In a MRI checkout, $PWD and some extra -I entries end up as # In a MRI checkout, $PWD and some extra -I entries end up as
@ -42,7 +43,7 @@ describe "The RUBYLIB environment variable" do
it "adds the directory after directories added by -I" do it "adds the directory after directories added by -I" do
dash_i_dir = tmp("dash_I_include") dash_i_dir = tmp("dash_I_include")
rubylib_dir = tmp("rubylib_include") rubylib_dir = tmp("rubylib_include")
ENV["RUBYLIB"] = rubylib_dir ENV["RUBYLIB"] = @pre + rubylib_dir
paths = ruby_exe("puts $LOAD_PATH", options: "-I #{dash_i_dir}").lines.map(&:chomp) paths = ruby_exe("puts $LOAD_PATH", options: "-I #{dash_i_dir}").lines.map(&:chomp)
paths.should include(dash_i_dir) paths.should include(dash_i_dir)
paths.should include(rubylib_dir) paths.should include(rubylib_dir)
@ -52,7 +53,7 @@ describe "The RUBYLIB environment variable" do
it "adds the directory after directories added by -I within RUBYOPT" do it "adds the directory after directories added by -I within RUBYOPT" do
rubyopt_dir = tmp("rubyopt_include") rubyopt_dir = tmp("rubyopt_include")
rubylib_dir = tmp("rubylib_include") rubylib_dir = tmp("rubylib_include")
ENV["RUBYLIB"] = rubylib_dir ENV["RUBYLIB"] = @pre + rubylib_dir
paths = ruby_exe("puts $LOAD_PATH", env: { "RUBYOPT" => "-I#{rubyopt_dir}" }).lines.map(&:chomp) paths = ruby_exe("puts $LOAD_PATH", env: { "RUBYOPT" => "-I#{rubyopt_dir}" }).lines.map(&:chomp)
paths.should include(rubyopt_dir) paths.should include(rubyopt_dir)
paths.should include(rubylib_dir) paths.should include(rubylib_dir)
@ -60,7 +61,7 @@ describe "The RUBYLIB environment variable" do
end end
it "keeps spaces in the value" do it "keeps spaces in the value" do
ENV["RUBYLIB"] = " rubylib/incl " ENV["RUBYLIB"] = @pre + " rubylib/incl "
out = ruby_exe("puts $LOAD_PATH") out = ruby_exe("puts $LOAD_PATH")
out.should include(" rubylib/incl ") out.should include(" rubylib/incl ")
end end