From a24b6d3f67a4eb1a163db2a9879b862d68ce898a Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 17 Apr 2013 05:20:14 +0000 Subject: [PATCH] envutil.rb: env hash * test/ruby/envutil.rb (assert_separately): keep environment hash first if exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/envutil.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 7a5356331a..0631a94ed3 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -292,7 +292,7 @@ module Test end eom args = args.dup - $:.each{|l| args.unshift "-I#{l}" } + args.insert((Hash === args.first ? 1 : 0), *$:.map {|l| "-I#{l}"}) ignore_stderr = opt.delete(:ignore_stderr) stdout, stderr, status = EnvUtil.invoke_ruby(args, src, true, true, opt) abort = status.coredump? || (status.signaled? && ABORT_SIGNALS.include?(status.termsig))