diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-19 05:22:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-19 05:22:51 +0000 |
| commit | 79d49d1a7004a1e461e9b4f239eed1d201ed9d51 (patch) | |
| tree | be6723c913c3b3abe0ed13c97218ea412d7e1715 | |
| parent | 72ad249e54505d55be266ff239deba42d0e31ea9 (diff) | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | basictest/runner.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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 diff --git a/basictest/runner.rb b/basictest/runner.rb index 0330b6d506..0f398e7acc 100755 --- a/basictest/runner.rb +++ b/basictest/runner.rb @@ -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/ |