diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/envutil.rb | 14 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 9759da0f73..e9b4b30896 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -133,7 +133,7 @@ module Test module Unit module Assertions public - def assert_valid_syntax(code, fname, mesg = fname) + def assert_valid_syntax(code, fname = caller_locations(1, 1)[0], mesg = fname.to_s) code = code.dup.force_encoding("ascii-8bit") code.sub!(/\A(?:\xef\xbb\xbf)?(\s*\#.*$)*(\n)?/n) { "#$&#{"\n" if $1 && !$2}BEGIN{throw tag, :ok}\n" @@ -141,15 +141,23 @@ module Test code.force_encoding("us-ascii") verbose, $VERBOSE = $VERBOSE, nil yield if defined?(yield) + case + when Array === fname + fname, line = *fname + when defined?(fname.path) && defined?(fname.lineno) + fname, line = fname.path, fname.lineno + else + line = 0 + end assert_nothing_raised(SyntaxError, mesg) do - assert_equal(:ok, catch {|tag| eval(code, binding, fname, 0)}, mesg) + assert_equal(:ok, catch {|tag| eval(code, binding, fname, line)}, mesg) end ensure $VERBOSE = verbose end def assert_normal_exit(testsrc, message = '', opt = {}) - assert_valid_syntax(testsrc, caller_locations(1, 1)[0].path) + assert_valid_syntax(testsrc, caller_locations(1, 1)[0]) if opt.include?(:child_env) opt = opt.dup child_env = [opt.delete(:child_env)] || [] diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 5af1ea48ba..8c1d0715df 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -278,7 +278,7 @@ eom def not_label(x) @result = x; @not_label ||= nil end def assert_not_label(expected, src, message = nil) @result = nil - assert_nothing_raised(SyntaxError, message) {eval(src)} + assert_valid_syntax(src, message) assert_equal(expected, @result, message) end |