1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "[ruby/fiddle] test: use env Hash"

Browse Source 
This reverts commit 4d844cbaed518743776594fa5ae33b86fe176ad1.
This commit is contained in:
Hiroshi SHIBATA 2019-10-24 19:53:26 +09:00 committed by SHIBATA Hiroshi
parent efd641ffab
commit de5ee47c3d
Notes: git 2019-10-24 20:58:57 +09:00 
Merged: https://github.com/ruby/ruby/pull/2603
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/fiddle/test_import.rb
View File

@ -149,21 +149,18 @@ module Fiddle
end end
def test_no_message_with_debug def test_no_message_with_debug
# disable all Ruby environment variables
orig_RUBYOPT, ENV['RUBYOPT'] = ENV['RUBYOPT'], nil
orig_RUBYLIB, ENV['RUBYLIB'] = ENV['RUBYLIB'], nil
# load development fiddle instead of bundled one # load development fiddle instead of bundled one
libdir = File.expand_path('../../../lib', __FILE__) libdir = File.expand_path('../../../lib', __FILE__)
libdir = nil unless File.file?(File.join(libdir, "fiddle/import.rb")) ENV['RUBYLIB'] = libdir if File.file?(File.join(libdir, "fiddle/import.rb"))
assert_in_out_err([
# disable all Ruby environment variables assert_in_out_err(%w[--debug --disable=gems -rfiddle/import], 'p Fiddle::Importer', ['Fiddle::Importer'])
{ ensure
"RUBYOPT" => nil, ENV['RUBYLIB'] = orig_RUBYLIB
"RUBYLIB" => libdir, ENV['RUBYOPT'] = orig_RUBYOPT
},
"--debug",
"--disable=gems",
"-rfiddle/import",
],
'p Fiddle::Importer',
['Fiddle::Importer'])
end end
end end
end if defined?(Fiddle) end if defined?(Fiddle)