fix "ruby -w" warnings

This commit is contained in:
Johan Holmberg 2015-08-08 23:42:14 +02:00
parent b82c90232c
commit 1ee1533ab2
4 changed files with 4 additions and 5 deletions

@ -246,7 +246,7 @@ module Cmdtest
end end
# --foo # --foo
elsif _arg() =~ /^(--\w[-_\w_]*)$/ elsif _arg() =~ /^(--\w[-\w]*)$/
option = _find_option($1) option = _find_option($1)
if option._with_arg() if option._with_arg()
option._set(_arg(1), @opts) option._set(_arg(1), @opts)
@ -257,7 +257,7 @@ module Cmdtest
end end
# --foo=... # --foo=...
elsif _arg() =~ /^(--\w[-_\w]*)=(.*)$/ elsif _arg() =~ /^(--\w[-\w]*)=(.*)$/
option = _find_option($1) option = _find_option($1)
if option._with_arg() if option._with_arg()
option._set($2, @opts) option._set($2, @opts)

@ -45,7 +45,6 @@ module Cmdtest
@dir = dir @dir = dir
@ignored_files = ignored_files @ignored_files = ignored_files
@fileinfo_by_path = {} @fileinfo_by_path = {}
dir_prefix = @dir + "/"
relative_find(@dir) do |path| relative_find(@dir) do |path|
next if path == "." next if path == "."
file_info = FileInfo.new(path, @dir) file_info = FileInfo.new(path, @dir)

@ -63,7 +63,7 @@ module Cmdtest
ORIG_CWD = Dir.pwd ORIG_CWD = Dir.pwd
attr_reader :_work_dir, :_cwd, :_env attr_reader :_work_dir, :_env
def initialize(test_method, clog, runner) def initialize(test_method, clog, runner)
@_test_method = test_method @_test_method = test_method

@ -159,7 +159,7 @@ module Cmdtest
_quote(_tmp_redirect_sh), _quote(_tmp_redirect_sh),
] ]
before = _take_snapshot before = _take_snapshot
ok = system(str) system(str) # TODO: really ignore exit status !?
after = _take_snapshot after = _take_snapshot
CmdEffects.new($?, CmdEffects.new($?,
File.read(_tmp_stdout_log), File.read(_tmp_stdout_log),