basictest: --run-opt option

* basictest/runner.rb: do not clobber the option by --run-opt with
  RUBYOPT.  reported by Allen Hewes <rallenh AT hotmail.com>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-10-19 05:22:51 +00:00
parent 72ad249e54
commit 79d49d1a70
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Wed Oct 19 14:22:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* basictest/runner.rb: do not clobber the option by --run-opt with
RUBYOPT. reported by Allen Hewes <rallenh AT hotmail.com>.
Wed Oct 19 00:09:06 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* addr2line.c (parse_debug_line_cu): boundary checks for

View File

@ -17,8 +17,8 @@ $stderr.reopen($stdout)
error = ''
srcdir = File.expand_path('..', File.dirname(__FILE__))
if opt = ENV["RUBYOPT"]
ENV["RUBYOPT"] = opt + " -W1"
if env = ENV["RUBYOPT"]
ENV["RUBYOPT"] = env + " -W1"
end
`#{ruby} #{opt} -W1 #{srcdir}/basictest/test.rb #{ARGV.join(' ')}`.each_line do |line|
if line =~ /^end of test/