Suppress void context warnings in verbose mode

2 files changed, 24 insertions, 24 deletions

diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb
index 694f2ee002..70ebd22a98 100644
--- a/test/ruby/test_ast.rb
+++ b/test/ruby/test_ast.rb
@@ -214,9 +214,9 @@ class TestAst < Test::Unit::TestCase
     end
   end
 
-  def assert_parse(code)
-    node = RubyVM::AbstractSyntaxTree.parse(code)
-    assert_kind_of(RubyVM::AbstractSyntaxTree::Node, node)
+  def assert_parse(code, warning: '')
+    node = assert_warning(warning) {RubyVM::AbstractSyntaxTree.parse(code)}
+    assert_kind_of(RubyVM::AbstractSyntaxTree::Node, node, code)
   end
 
   def assert_invalid_parse(msg, code)
@@ -245,14 +245,14 @@ class TestAst < Test::Unit::TestCase
       assert_invalid_parse(msg, "begin; #{code}; end")
       assert_parse("END {#{code}}")
 
-      assert_parse("defined?(#{code})")
+      assert_parse("!defined?(#{code})")
       assert_parse("def m; defined?(#{code}); end")
-      assert_parse("begin; defined?(#{code}); end")
+      assert_parse("!begin; defined?(#{code}); end")
 
       next if code.include?(" ")
-      assert_parse("defined? #{code}")
+      assert_parse("!defined? #{code}")
       assert_parse("def m; defined? #{code}; end")
-      assert_parse("begin; defined? #{code}; end")
+      assert_parse("!begin; defined? #{code}; end")
     end
   end
 
@@ -268,17 +268,17 @@ class TestAst < Test::Unit::TestCase
     assert_invalid_parse(msg, "END {retry}")
     assert_invalid_parse(msg, "begin rescue; END {retry}; end")
 
-    assert_parse("defined?(retry)")
+    assert_parse("!defined?(retry)")
     assert_parse("def m; defined?(retry); end")
-    assert_parse("begin defined?(retry); end")
+    assert_parse("!begin defined?(retry); end")
     assert_parse("begin rescue; else; defined?(retry); end")
     assert_parse("begin rescue; ensure; defined?(retry); end")
     assert_parse("END {defined?(retry)}")
     assert_parse("begin rescue; END {defined?(retry)}; end")
-    assert_parse("defined? retry")
+    assert_parse("!defined? retry")
 
     assert_parse("def m; defined? retry; end")
-    assert_parse("begin defined? retry; end")
+    assert_parse("!begin defined? retry; end")
     assert_parse("begin rescue; else; defined? retry; end")
     assert_parse("begin rescue; ensure; defined? retry; end")
     assert_parse("END {defined? retry}")
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 9b897f56d1..572f26dcb7 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -368,19 +368,19 @@ class TestRubyOptions < Test::Unit::TestCase
   end
 
   def test_syntax_check
-    assert_in_out_err(%w(-c -e a=1+1 -e !a), "", ["Syntax OK"], [])
-    assert_in_out_err(%w(-c -e break), "", [], ["-e:1: Invalid break", :*])
-    assert_in_out_err(%w(-c -e next), "", [], ["-e:1: Invalid next", :*])
-    assert_in_out_err(%w(-c -e redo), "", [], ["-e:1: Invalid redo", :*])
-    assert_in_out_err(%w(-c -e retry), "", [], ["-e:1: Invalid retry", :*])
-    assert_in_out_err(%w(-c -e begin -e break -e end), "", [], ["-e:2: Invalid break", :*])
-    assert_in_out_err(%w(-c -e begin -e next -e end), "", [], ["-e:2: Invalid next", :*])
-    assert_in_out_err(%w(-c -e begin -e redo -e end), "", [], ["-e:2: Invalid redo", :*])
-    assert_in_out_err(%w(-c -e begin -e retry -e end), "", [], ["-e:2: Invalid retry", :*])
-    assert_in_out_err(%w(-c -e !defined?(break)), "", ["Syntax OK"], [])
-    assert_in_out_err(%w(-c -e !defined?(next)), "", ["Syntax OK"], [])
-    assert_in_out_err(%w(-c -e !defined?(redo)), "", ["Syntax OK"], [])
-    assert_in_out_err(%w(-c -e !defined?(retry)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e a=1+1 -e !a), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e break), "", [], ["-e:1: Invalid break", :*])
+    assert_in_out_err(%w(-cw -e next), "", [], ["-e:1: Invalid next", :*])
+    assert_in_out_err(%w(-cw -e redo), "", [], ["-e:1: Invalid redo", :*])
+    assert_in_out_err(%w(-cw -e retry), "", [], ["-e:1: Invalid retry", :*])
+    assert_in_out_err(%w(-cw -e begin -e break -e end), "", [], ["-e:2: Invalid break", :*])
+    assert_in_out_err(%w(-cw -e begin -e next -e end), "", [], ["-e:2: Invalid next", :*])
+    assert_in_out_err(%w(-cw -e begin -e redo -e end), "", [], ["-e:2: Invalid redo", :*])
+    assert_in_out_err(%w(-cw -e begin -e retry -e end), "", [], ["-e:2: Invalid retry", :*])
+    assert_in_out_err(%w(-cw -e !defined?(break)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e !defined?(next)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e !defined?(redo)), "", ["Syntax OK"], [])
+    assert_in_out_err(%w(-cw -e !defined?(retry)), "", ["Syntax OK"], [])
   end
 
   def test_invalid_option