[前][次][番号順一覧][スレッド一覧]

ruby-changes:58411

From: Hiroshi <ko1@a...>
Date: Thu, 24 Oct 2019 21:06:14 +0900 (JST)
Subject: [ruby-changes:58411] de5ee47c3d (master): Revert "[ruby/fiddle] test: use env Hash"

https://git.ruby-lang.org/ruby.git/commit/?id=de5ee47c3d

From de5ee47c3da9d06e8dcffa35e4e7f9b5a3122907 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Thu, 24 Oct 2019 19:53:26 +0900
Subject: Revert "[ruby/fiddle] test: use env Hash"

This reverts commit 4d844cbaed518743776594fa5ae33b86fe176ad1.

diff --git a/test/fiddle/test_import.rb b/test/fiddle/test_import.rb
index 3170e9e..e243105 100644
--- a/test/fiddle/test_import.rb
+++ b/test/fiddle/test_import.rb
@@ -149,21 +149,18 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_import.rb#L149
     end
 
     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
       libdir = File.expand_path('../../../lib', __FILE__)
-      libdir = nil unless File.file?(File.join(libdir, "fiddle/import.rb"))
-      assert_in_out_err([
-                          # disable all Ruby environment variables
-                          {
-                            "RUBYOPT" => nil,
-                            "RUBYLIB" => libdir,
-                          },
-                          "--debug",
-                          "--disable=gems",
-                          "-rfiddle/import",
-                        ],
-                        'p Fiddle::Importer',
-                        ['Fiddle::Importer'])
+      ENV['RUBYLIB'] = libdir if File.file?(File.join(libdir, "fiddle/import.rb"))
+
+      assert_in_out_err(%w[--debug --disable=gems -rfiddle/import], 'p Fiddle::Importer', ['Fiddle::Importer'])
+    ensure
+      ENV['RUBYLIB'] = orig_RUBYLIB
+      ENV['RUBYOPT'] = orig_RUBYOPT
     end
   end
 end if defined?(Fiddle)
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]