summaryrefslogtreecommitdiff
path: root/spec/ruby/command_line
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-06-30 13:53:10 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-06-30 13:53:10 +0000
commit5235d57b0700c9f67892847d7f8fa055e98ca4d6 (patch)
tree853a0ba931cd715655e3b869e93b5c45ee3a5474 /spec/ruby/command_line
parent7b230cfe2802a06d9d5cf3c0e3b880233f6fd3fd (diff)
Fix spec/ruby/command_line/rubylib_spec.rb for use with make test-spec
* 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
Diffstat (limited to 'spec/ruby/command_line')
-rw-r--r--spec/ruby/command_line/rubylib_spec.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/spec/ruby/command_line/rubylib_spec.rb b/spec/ruby/command_line/rubylib_spec.rb
index d16579026a0..20e9c2cf954 100644
--- a/spec/ruby/command_line/rubylib_spec.rb
+++ b/spec/ruby/command_line/rubylib_spec.rb
@@ -3,6 +3,7 @@ require_relative '../spec_helper'
describe "The RUBYLIB environment variable" do
before :each do
@rubylib, ENV["RUBYLIB"] = ENV["RUBYLIB"], nil
+ @pre = @rubylib.nil? ? '' : @rubylib + File::PATH_SEPARATOR
end
after :each do
@@ -11,14 +12,14 @@ describe "The RUBYLIB environment variable" do
it "adds a directory to $LOAD_PATH" do
dir = tmp("rubylib/incl")
- ENV["RUBYLIB"] = dir
+ ENV["RUBYLIB"] = @pre + dir
paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
paths.should include(dir)
end
it "adds a File::PATH_SEPARATOR-separated list of directories to $LOAD_PATH" do
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.should include(dir1)
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
dir = tmp("rubylib/incl_front")
- ENV["RUBYLIB"] = dir
+ ENV["RUBYLIB"] = @pre + dir
paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
if PlatformGuard.implementation? :ruby
# 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
dash_i_dir = tmp("dash_I_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.should include(dash_i_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
rubyopt_dir = tmp("rubyopt_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.should include(rubyopt_dir)
paths.should include(rubylib_dir)
@@ -60,7 +61,7 @@ describe "The RUBYLIB environment variable" do
end
it "keeps spaces in the value" do
- ENV["RUBYLIB"] = " rubylib/incl "
+ ENV["RUBYLIB"] = @pre + " rubylib/incl "
out = ruby_exe("puts $LOAD_PATH")
out.should include(" rubylib/incl ")
end