From 9bd17226d5cc9e36937497664886d05d527bfd19 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Tue, 30 Apr 2019 16:35:47 +0900
Subject: Refine error message output for `mruby` command

- Write message to stderr instead of stdout.
- Avoid duplicate message output (`SyntaxError`, `ScriptError` etc).
- Refine invalid option message.
- Suppress redundant usage output.
- Fix some incorrect exit code.
---
 mrbgems/mruby-bin-mruby/bintest/mruby.rb | 51 +++++++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 4 deletions(-)

(limited to 'mrbgems/mruby-bin-mruby/bintest/mruby.rb')

diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
index e8d1510f7..1dced07f9 100644
--- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
@@ -1,10 +1,16 @@
 require 'tempfile'
+require 'open3'
+
+assert_mruby = ->(exp_out_pattern, exp_err_pattern, exp_success, args) do
+  out, err, stat = Open3.capture3(cmd("mruby"), *args)
+  assert_match(exp_out_pattern, out, "standard output")
+  assert_match(exp_err_pattern, err, "standard error")
+  assert_equal(exp_success, stat.success?, "exit success?")
+end
 
 assert('regression for #1564') do
-  o = `#{cmd('mruby')} -e #{shellquote('<<')} 2>&1`
-  assert_include o, "-e:1:2: syntax error"
-  o = `#{cmd('mruby')} -e #{shellquote('<<-')} 2>&1`
-  assert_include o, "-e:1:3: syntax error"
+  assert_mruby.("", "-e:1:2: syntax error, *", false, %w[-e <<])
+  assert_mruby.("", "-e:1:3: syntax error, *", false, %w[-e <<-])
 end
 
 assert('regression for #1572') do
@@ -66,6 +72,11 @@ RUBY
   assert_equal 0, $?.exitstatus
 end
 
+assert('mruby -c option') do
+  assert_mruby.("Syntax OK\n", "", true, ["-c", "-e", "p 1"])
+  assert_mruby.("", "-e:1:7: syntax error, *", false, ["-c", "-e", "p 1; 1."])
+end
+
 assert('mruby -d option') do
   o = `#{cmd('mruby')} -e #{shellquote('p $DEBUG')}`
   assert_equal "false\n", o
@@ -73,6 +84,14 @@ assert('mruby -d option') do
   assert_equal "true\n", o
 end
 
+assert('mruby -e option (no code specified)') do
+  assert_mruby.("", "* No code specified for -e\n", false, %w[-e])
+end
+
+assert('mruby -h option') do
+  assert_mruby.("Usage: *mruby*", "", true, %w[-h])
+end
+
 assert('mruby -r option') do
   lib = Tempfile.new('lib.rb')
   lib.write <<EOS
@@ -95,3 +114,27 @@ EOS
   assert_equal 'hogeClass', `#{cmd('mruby')} -r #{lib.path} -r #{script.path} -e #{shellquote('print Hoge.class')}`
   assert_equal 0, $?.exitstatus
 end
+
+assert('mruby -r option (no library specified)') do
+  assert_mruby.("", "*: No library specified for -r\n", false, %w[-r])
+end
+
+assert('mruby -r option (file not found)') do
+  assert_mruby.("", "*: Cannot open library file: *", false, %w[-r _no_exists_])
+end
+
+assert('mruby invalid short option') do
+  assert_mruby.("", "*: invalid option -1 *", false, %w[-1])
+end
+
+assert('mruby invalid long option') do
+  assert_mruby.("", "*: invalid option --longopt *", false, %w[--longopt])
+end
+
+assert('unhandled exception') do
+  assert_mruby.("", "* EXCEPTION!*", false, %w[-e raise("EXCEPTION!")])
+end
+
+assert('program file not found') do
+  assert_mruby.("", "*: Cannot open program file*", false, %w[_no_exists_])
+end
-- 
cgit v1.2.3


From 2a94bf8fbd9afb49e1c2b83126f5952b2864d781 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Wed, 1 May 2019 16:49:56 +0900
Subject: Small fix in `mruby-bin-mruby`

- Modify some error messages for consistency.
- Add test for codegen error.
- Use regular expression for error message matching in test.
---
 mrbgems/mruby-bin-mruby/bintest/mruby.rb    | 33 +++++++++++++++++------------
 mrbgems/mruby-bin-mruby/tools/mruby/mruby.c |  4 ++--
 2 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'mrbgems/mruby-bin-mruby/bintest/mruby.rb')

diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
index 1dced07f9..d1262254b 100644
--- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
@@ -1,16 +1,16 @@
 require 'tempfile'
 require 'open3'
 
-assert_mruby = ->(exp_out_pattern, exp_err_pattern, exp_success, args) do
+assert_mruby = ->(exp_out, exp_err, exp_success, args) do
   out, err, stat = Open3.capture3(cmd("mruby"), *args)
-  assert_match(exp_out_pattern, out, "standard output")
-  assert_match(exp_err_pattern, err, "standard error")
+  assert_operator(exp_out, :===, out, "standard output")
+  assert_operator(exp_err, :===, err, "standard error")
   assert_equal(exp_success, stat.success?, "exit success?")
 end
 
 assert('regression for #1564') do
-  assert_mruby.("", "-e:1:2: syntax error, *", false, %w[-e <<])
-  assert_mruby.("", "-e:1:3: syntax error, *", false, %w[-e <<-])
+  assert_mruby.("", /\A-e:1:2: syntax error, .*\n\z/, false, %w[-e <<])
+  assert_mruby.("", /\A-e:1:3: syntax error, .*\n\z/, false, %w[-e <<-])
 end
 
 assert('regression for #1572') do
@@ -74,7 +74,7 @@ end
 
 assert('mruby -c option') do
   assert_mruby.("Syntax OK\n", "", true, ["-c", "-e", "p 1"])
-  assert_mruby.("", "-e:1:7: syntax error, *", false, ["-c", "-e", "p 1; 1."])
+  assert_mruby.("", /\A-e:1:7: syntax error, .*\n\z/, false, ["-c", "-e", "p 1; 1."])
 end
 
 assert('mruby -d option') do
@@ -85,11 +85,11 @@ assert('mruby -d option') do
 end
 
 assert('mruby -e option (no code specified)') do
-  assert_mruby.("", "* No code specified for -e\n", false, %w[-e])
+  assert_mruby.("", /\A.*: No code specified for -e\n\z/, false, %w[-e])
 end
 
 assert('mruby -h option') do
-  assert_mruby.("Usage: *mruby*", "", true, %w[-h])
+  assert_mruby.(/\AUsage: #{Regexp.escape cmd("mruby")} .*/m, "", true, %w[-h])
 end
 
 assert('mruby -r option') do
@@ -116,25 +116,30 @@ EOS
 end
 
 assert('mruby -r option (no library specified)') do
-  assert_mruby.("", "*: No library specified for -r\n", false, %w[-r])
+  assert_mruby.("", /\A.*: No library specified for -r\n\z/, false, %w[-r])
 end
 
 assert('mruby -r option (file not found)') do
-  assert_mruby.("", "*: Cannot open library file: *", false, %w[-r _no_exists_])
+  assert_mruby.("", /\A.*: Cannot open library file: .*\n\z/, false, %w[-r _no_exists_])
 end
 
 assert('mruby invalid short option') do
-  assert_mruby.("", "*: invalid option -1 *", false, %w[-1])
+  assert_mruby.("", /\A.*: invalid option -1 .*\n\z/, false, %w[-1])
 end
 
 assert('mruby invalid long option') do
-  assert_mruby.("", "*: invalid option --longopt *", false, %w[--longopt])
+  assert_mruby.("", /\A.*: invalid option --longopt .*\n\z/, false, %w[--longopt])
 end
 
 assert('unhandled exception') do
-  assert_mruby.("", "* EXCEPTION!*", false, %w[-e raise("EXCEPTION!")])
+  assert_mruby.("", /\bEXCEPTION\b.*\n\z/, false, %w[-e raise("EXCEPTION")])
 end
 
 assert('program file not found') do
-  assert_mruby.("", "*: Cannot open program file*", false, %w[_no_exists_])
+  assert_mruby.("", /\A.*: Cannot open program file: .*\n\z/, false, %w[_no_exists_])
+end
+
+assert('codegen error') do
+  code = "def f(#{(1..100).map{|n| "a#{n}"} * ","}); end"
+  assert_mruby.("", /\Acodegen error:.*\n\z/, false, ["-e", code])
 end
diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
index c96365c9f..29ab4c17c 100644
--- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
+++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c
@@ -158,7 +158,7 @@ append_cmdline:
     else {
       args->rfp = fopen(argv[0], args->mrbfile ? "rb" : "r");
       if (args->rfp == NULL) {
-        fprintf(stderr, "%s: Cannot open program file. (%s)\n", *origargv, *argv);
+        fprintf(stderr, "%s: Cannot open program file: %s\n", *origargv, *argv);
         return EXIT_FAILURE;
       }
       args->fname = TRUE;
@@ -285,7 +285,7 @@ main(int argc, char **argv)
       n = EXIT_FAILURE;
     }
     else if (args.check_syntax) {
-      printf("Syntax OK\n");
+      puts("Syntax OK");
     }
   }
   cleanup(mrb, &args);
-- 
cgit v1.2.3


From 35319bed01d58c785f73ce03e67d4e58be30f4b5 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Thu, 2 May 2019 23:03:38 +0900
Subject: Use a normal method instead of a lambda in bintest/mruby; ref #4416

---
 mrbgems/mruby-bin-mruby/bintest/mruby.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'mrbgems/mruby-bin-mruby/bintest/mruby.rb')

diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
index d1262254b..09350ff49 100644
--- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
@@ -1,7 +1,7 @@
 require 'tempfile'
 require 'open3'
 
-assert_mruby = ->(exp_out, exp_err, exp_success, args) do
+def assert_mruby(exp_out, exp_err, exp_success, args)
   out, err, stat = Open3.capture3(cmd("mruby"), *args)
   assert_operator(exp_out, :===, out, "standard output")
   assert_operator(exp_err, :===, err, "standard error")
@@ -9,8 +9,8 @@ assert_mruby = ->(exp_out, exp_err, exp_success, args) do
 end
 
 assert('regression for #1564') do
-  assert_mruby.("", /\A-e:1:2: syntax error, .*\n\z/, false, %w[-e <<])
-  assert_mruby.("", /\A-e:1:3: syntax error, .*\n\z/, false, %w[-e <<-])
+  assert_mruby("", /\A-e:1:2: syntax error, .*\n\z/, false, %w[-e <<])
+  assert_mruby("", /\A-e:1:3: syntax error, .*\n\z/, false, %w[-e <<-])
 end
 
 assert('regression for #1572') do
@@ -73,8 +73,8 @@ RUBY
 end
 
 assert('mruby -c option') do
-  assert_mruby.("Syntax OK\n", "", true, ["-c", "-e", "p 1"])
-  assert_mruby.("", /\A-e:1:7: syntax error, .*\n\z/, false, ["-c", "-e", "p 1; 1."])
+  assert_mruby("Syntax OK\n", "", true, ["-c", "-e", "p 1"])
+  assert_mruby("", /\A-e:1:7: syntax error, .*\n\z/, false, ["-c", "-e", "p 1; 1."])
 end
 
 assert('mruby -d option') do
@@ -85,11 +85,11 @@ assert('mruby -d option') do
 end
 
 assert('mruby -e option (no code specified)') do
-  assert_mruby.("", /\A.*: No code specified for -e\n\z/, false, %w[-e])
+  assert_mruby("", /\A.*: No code specified for -e\n\z/, false, %w[-e])
 end
 
 assert('mruby -h option') do
-  assert_mruby.(/\AUsage: #{Regexp.escape cmd("mruby")} .*/m, "", true, %w[-h])
+  assert_mruby(/\AUsage: #{Regexp.escape cmd("mruby")} .*/m, "", true, %w[-h])
 end
 
 assert('mruby -r option') do
@@ -116,30 +116,30 @@ EOS
 end
 
 assert('mruby -r option (no library specified)') do
-  assert_mruby.("", /\A.*: No library specified for -r\n\z/, false, %w[-r])
+  assert_mruby("", /\A.*: No library specified for -r\n\z/, false, %w[-r])
 end
 
 assert('mruby -r option (file not found)') do
-  assert_mruby.("", /\A.*: Cannot open library file: .*\n\z/, false, %w[-r _no_exists_])
+  assert_mruby("", /\A.*: Cannot open library file: .*\n\z/, false, %w[-r _no_exists_])
 end
 
 assert('mruby invalid short option') do
-  assert_mruby.("", /\A.*: invalid option -1 .*\n\z/, false, %w[-1])
+  assert_mruby("", /\A.*: invalid option -1 .*\n\z/, false, %w[-1])
 end
 
 assert('mruby invalid long option') do
-  assert_mruby.("", /\A.*: invalid option --longopt .*\n\z/, false, %w[--longopt])
+  assert_mruby("", /\A.*: invalid option --longopt .*\n\z/, false, %w[--longopt])
 end
 
 assert('unhandled exception') do
-  assert_mruby.("", /\bEXCEPTION\b.*\n\z/, false, %w[-e raise("EXCEPTION")])
+  assert_mruby("", /\bEXCEPTION\b.*\n\z/, false, %w[-e raise("EXCEPTION")])
 end
 
 assert('program file not found') do
-  assert_mruby.("", /\A.*: Cannot open program file: .*\n\z/, false, %w[_no_exists_])
+  assert_mruby("", /\A.*: Cannot open program file: .*\n\z/, false, %w[_no_exists_])
 end
 
 assert('codegen error') do
   code = "def f(#{(1..100).map{|n| "a#{n}"} * ","}); end"
-  assert_mruby.("", /\Acodegen error:.*\n\z/, false, ["-e", code])
+  assert_mruby("", /\Acodegen error:.*\n\z/, false, ["-e", code])
 end
-- 
cgit v1.2.3


From a215292b6ad4315a5a0edef49a1df65e3f27b46a Mon Sep 17 00:00:00 2001
From: dearblue <dearblue@users.noreply.github.com>
Date: Fri, 28 Jun 2019 23:13:29 +0900
Subject: Use nested `assert`

---
 mrbgems/mruby-bin-mruby/bintest/mruby.rb |  8 +++++---
 mrbgems/mruby-complex/test/complex.rb    |  6 ++++--
 mrbgems/mruby-io/test/io.rb              | 32 +++++++++++++++++---------------
 mrbgems/mruby-pack/test/pack.rb          |  6 ++++--
 mrbgems/mruby-rational/test/rational.rb  | 20 ++++++++++++--------
 5 files changed, 42 insertions(+), 30 deletions(-)

(limited to 'mrbgems/mruby-bin-mruby/bintest/mruby.rb')

diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
index 09350ff49..5dbbc5592 100644
--- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
@@ -3,9 +3,11 @@ require 'open3'
 
 def assert_mruby(exp_out, exp_err, exp_success, args)
   out, err, stat = Open3.capture3(cmd("mruby"), *args)
-  assert_operator(exp_out, :===, out, "standard output")
-  assert_operator(exp_err, :===, err, "standard error")
-  assert_equal(exp_success, stat.success?, "exit success?")
+  assert do
+    assert_operator(exp_out, :===, out, "standard output")
+    assert_operator(exp_err, :===, err, "standard error")
+    assert_equal(exp_success, stat.success?, "exit success?")
+  end
 end
 
 assert('regression for #1564') do
diff --git a/mrbgems/mruby-complex/test/complex.rb b/mrbgems/mruby-complex/test/complex.rb
index 6996eb214..ab882664e 100644
--- a/mrbgems/mruby-complex/test/complex.rb
+++ b/mrbgems/mruby-complex/test/complex.rb
@@ -1,6 +1,8 @@
 def assert_complex(real, exp)
-  assert_float real.real,      exp.real
-  assert_float real.imaginary, exp.imaginary
+  assert do
+    assert_float real.real,      exp.real
+    assert_float real.imaginary, exp.imaginary
+  end
 end
 
 assert 'Complex' do
diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb
index ef0b49643..1491a4cfe 100644
--- a/mrbgems/mruby-io/test/io.rb
+++ b/mrbgems/mruby-io/test/io.rb
@@ -5,24 +5,26 @@ MRubyIOTestUtil.io_test_setup
 $cr, $crlf, $cmd = MRubyIOTestUtil.win? ? [1, "\r\n", "cmd /c "] : [0, "\n", ""]
 
 def assert_io_open(meth)
-  fd = IO.sysopen($mrbtest_io_rfname)
-  assert_equal Fixnum, fd.class
-  io1 = IO.__send__(meth, fd)
-  begin
-    assert_equal IO, io1.class
-    assert_equal $mrbtest_io_msg, io1.read
-  ensure
-    io1.close
-  end
+  assert do
+    fd = IO.sysopen($mrbtest_io_rfname)
+    assert_equal Fixnum, fd.class
+    io1 = IO.__send__(meth, fd)
+    begin
+      assert_equal IO, io1.class
+      assert_equal $mrbtest_io_msg, io1.read
+    ensure
+      io1.close
+    end
 
-  io2 = IO.__send__(meth, IO.sysopen($mrbtest_io_rfname))do |io|
-    if meth == :open
-      assert_equal $mrbtest_io_msg, io.read
-    else
-      flunk "IO.#{meth} does not take block"
+    io2 = IO.__send__(meth, IO.sysopen($mrbtest_io_rfname))do |io|
+      if meth == :open
+        assert_equal $mrbtest_io_msg, io.read
+      else
+        flunk "IO.#{meth} does not take block"
+      end
     end
+    io2.close unless meth == :open
   end
-  io2.close unless meth == :open
 end
 
 assert('IO.class', '15.2.20') do
diff --git a/mrbgems/mruby-pack/test/pack.rb b/mrbgems/mruby-pack/test/pack.rb
index 110aee5db..eb24e8d1f 100644
--- a/mrbgems/mruby-pack/test/pack.rb
+++ b/mrbgems/mruby-pack/test/pack.rb
@@ -2,8 +2,10 @@ PACK_IS_LITTLE_ENDIAN = "\x01\00".unpack('S')[0] == 0x01
 
 def assert_pack tmpl, packed, unpacked
   t = tmpl.inspect
-  assert_equal packed, unpacked.pack(tmpl), "#{unpacked.inspect}.pack(#{t})"
-  assert_equal unpacked, packed.unpack(tmpl), "#{packed.inspect}.unpack(#{t})"
+  assert do
+    assert_equal packed, unpacked.pack(tmpl), "#{unpacked.inspect}.pack(#{t})"
+    assert_equal unpacked, packed.unpack(tmpl), "#{packed.inspect}.unpack(#{t})"
+  end
 end
 
 # pack & unpack 'm' (base64)
diff --git a/mrbgems/mruby-rational/test/rational.rb b/mrbgems/mruby-rational/test/rational.rb
index 5e9d9ea48..11737034b 100644
--- a/mrbgems/mruby-rational/test/rational.rb
+++ b/mrbgems/mruby-rational/test/rational.rb
@@ -23,17 +23,21 @@ class ComplexLikeNumeric < UserDefinedNumeric
 end
 
 def assert_rational(exp, real)
-  assert_float exp.numerator,   real.numerator
-  assert_float exp.denominator, real.denominator
+  assert do
+    assert_float exp.numerator,   real.numerator
+    assert_float exp.denominator, real.denominator
+  end
 end
 
 def assert_equal_rational(exp, o1, o2)
-  if exp
-    assert_operator(o1, :==, o2)
-    assert_not_operator(o1, :!=, o2)
-  else
-    assert_not_operator(o1, :==, o2)
-    assert_operator(o1, :!=, o2)
+  assert do
+    if exp
+      assert_operator(o1, :==, o2)
+      assert_not_operator(o1, :!=, o2)
+    else
+      assert_not_operator(o1, :==, o2)
+      assert_operator(o1, :!=, o2)
+    end
   end
 end
 
-- 
cgit v1.2.3


From 44381f0a0c306a8c778f546926d3febfdf981b45 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Tue, 30 Jul 2019 12:46:24 +0900
Subject: Refine message to `skip` in nested `assert`

- I think "Info" is used only to `skip`, so change to "Skip".
- Changed the default value of `assert` and specify the argument explicitly
  at the caller of `assert` because it is unnatural "Assertion failed" is
  output even though the assertion doesn't fail.

== Example:

  def assert_foo(exp, act)
    assert do
      assert_equal exp[0], act[0]
      assert_equal exp[1], act[1]
    end
  end

  def assert_bar(exp, act)
    assert do
      skip
    end
  end

  def assert_baz(exp, act)
    assert do
      assert_equal exp, act
      assert_bar exp, act
    end
  end

  assert 'test#skip_in_nested_assert' do
    assert_baz 1, 1
  end

  === Before this patch:

    ?..
    Info: test#skip_in_nested_assert (core)
     - Assertion[1]
        Info: Assertion failed (core)
         - Assertion[1-2]
            Skip: Assertion failed (core)
      Total: 3
         OK: 2
         KO: 0
      Crash: 0
    Warning: 0
       Skip: 1

  === After this patch:

    ???
    Skip: test#skip_in_nested_assert (core)
     - Assertion[1]
        Skip: assert (core)
         - Assertion[1-2]
            Skip: assert (core)
      Total: 3
         OK: 0
         KO: 0
      Crash: 0
    Warning: 0
       Skip: 3
---
 mrbgems/mruby-bin-mruby/bintest/mruby.rb | 2 +-
 mrbgems/mruby-complex/test/complex.rb    | 2 +-
 mrbgems/mruby-io/test/io.rb              | 2 +-
 mrbgems/mruby-pack/test/pack.rb          | 2 +-
 mrbgems/mruby-rational/test/rational.rb  | 4 ++--
 test/assert.rb                           | 8 ++++----
 test/t/numeric.rb                        | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'mrbgems/mruby-bin-mruby/bintest/mruby.rb')

diff --git a/mrbgems/mruby-bin-mruby/bintest/mruby.rb b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
index 5dbbc5592..e032ff79a 100644
--- a/mrbgems/mruby-bin-mruby/bintest/mruby.rb
+++ b/mrbgems/mruby-bin-mruby/bintest/mruby.rb
@@ -3,7 +3,7 @@ require 'open3'
 
 def assert_mruby(exp_out, exp_err, exp_success, args)
   out, err, stat = Open3.capture3(cmd("mruby"), *args)
-  assert do
+  assert "assert_mruby" do
     assert_operator(exp_out, :===, out, "standard output")
     assert_operator(exp_err, :===, err, "standard error")
     assert_equal(exp_success, stat.success?, "exit success?")
diff --git a/mrbgems/mruby-complex/test/complex.rb b/mrbgems/mruby-complex/test/complex.rb
index 5b7c3bfa4..4ae80515b 100644
--- a/mrbgems/mruby-complex/test/complex.rb
+++ b/mrbgems/mruby-complex/test/complex.rb
@@ -1,5 +1,5 @@
 def assert_complex(real, exp)
-  assert do
+  assert "assert_complex" do
     assert_float real.real,      exp.real
     assert_float real.imaginary, exp.imaginary
   end
diff --git a/mrbgems/mruby-io/test/io.rb b/mrbgems/mruby-io/test/io.rb
index 1491a4cfe..3aaa109a8 100644
--- a/mrbgems/mruby-io/test/io.rb
+++ b/mrbgems/mruby-io/test/io.rb
@@ -5,7 +5,7 @@ MRubyIOTestUtil.io_test_setup
 $cr, $crlf, $cmd = MRubyIOTestUtil.win? ? [1, "\r\n", "cmd /c "] : [0, "\n", ""]
 
 def assert_io_open(meth)
-  assert do
+  assert "assert_io_open" do
     fd = IO.sysopen($mrbtest_io_rfname)
     assert_equal Fixnum, fd.class
     io1 = IO.__send__(meth, fd)
diff --git a/mrbgems/mruby-pack/test/pack.rb b/mrbgems/mruby-pack/test/pack.rb
index 68ef4165f..6832adcc7 100644
--- a/mrbgems/mruby-pack/test/pack.rb
+++ b/mrbgems/mruby-pack/test/pack.rb
@@ -2,7 +2,7 @@ PACK_IS_LITTLE_ENDIAN = "\x01\00".unpack('S')[0] == 0x01
 
 def assert_pack tmpl, packed, unpacked
   t = tmpl.inspect
-  assert do
+  assert "assert_pack" do
     assert_equal packed, unpacked.pack(tmpl), "#{unpacked.inspect}.pack(#{t})"
     assert_equal unpacked, packed.unpack(tmpl), "#{packed.inspect}.unpack(#{t})"
   end
diff --git a/mrbgems/mruby-rational/test/rational.rb b/mrbgems/mruby-rational/test/rational.rb
index 11737034b..a8ebb8ea2 100644
--- a/mrbgems/mruby-rational/test/rational.rb
+++ b/mrbgems/mruby-rational/test/rational.rb
@@ -23,14 +23,14 @@ class ComplexLikeNumeric < UserDefinedNumeric
 end
 
 def assert_rational(exp, real)
-  assert do
+  assert "assert_rational" do
     assert_float exp.numerator,   real.numerator
     assert_float exp.denominator, real.denominator
   end
 end
 
 def assert_equal_rational(exp, o1, o2)
-  assert do
+  assert "assert_equal_rational" do
     if exp
       assert_operator(o1, :==, o2)
       assert_not_operator(o1, :!=, o2)
diff --git a/test/assert.rb b/test/assert.rb
index 58ee4b913..5ae46ca70 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -76,7 +76,7 @@ end
 # iso : The ISO reference code of the feature
 #       which will be tested by this
 #       assertion
-def assert(str = 'Assertion failed', iso = '')
+def assert(str = 'assert', iso = '')
   t_print(str, (iso != '' ? " [#{iso}]" : ''), ' : ') if $mrbtest_verbose
   begin
     $mrbtest_child_noassert ||= [0]
@@ -99,10 +99,10 @@ def assert(str = 'Assertion failed', iso = '')
     yield
     if $mrbtest_assert.size > 0
       if $mrbtest_assert.size == $mrbtest_child_noassert[-1]
-        $asserts.push(assertion_string('Info: ', str, iso))
+        $asserts.push(assertion_string('Skip: ', str, iso))
         $mrbtest_child_noassert[-2] += 1
-        $ok_test += 1
-        t_print('.')
+        $skip_test += 1
+        t_print('?')
       else
         $asserts.push(assertion_string('Fail: ', str, iso))
         $ko_test += 1
diff --git a/test/t/numeric.rb b/test/t/numeric.rb
index bb95f8ef3..5b1e79153 100644
--- a/test/t/numeric.rb
+++ b/test/t/numeric.rb
@@ -8,7 +8,7 @@ def  assert_step(exp, receiver, args, inf: false)
     break if inf && exp.size == act.size
   end
   expr = "#{receiver.inspect}.step(#{args.map(&:inspect).join(', ')})"
-  assert do
+  assert "assert_step" do
     assert_true(exp.eql?(act), "#{expr}: counters", assertion_diff(exp, act))
     assert_same(receiver, ret, "#{expr}: return value") unless inf
   end
-- 
cgit v1.2.3