Add a tagging system to bootstraptest

Author: chrisseaton

test/bootstraptest/runner.rb

@@ -186,6 +186,7 @@ def erase(e = true)
 def exec_test(pathes)
   @count = 0
   @error = 0
+  @tagged = 0
   @errbuf = []
   @location = nil
   @columns = 0
@@ -198,14 +199,15 @@ def exec_test(pathes)
     $stderr.puts if @verbose
     count = @count
     error = @error
+    tagged = @tagged
     load File.expand_path(path)
     if @tty
       if @error == error
-        msg = "PASS #{@count-count}"
+        msg = "PASS #{(@count-count)-(@tagged-tagged)} (#{@tagged-tagged} tagged)"
         @columns += msg.size - 1
         $stderr.print "#{@progress_bs}#{@passed}#{msg}#{@reset}"
       else
-        msg = "FAIL #{@error-error}/#{@count-count}"
+        msg = "FAIL #{@error-error}/#{(@count-count)-(@tagged-tagged)} (#{@tagged-tagged} tagged)"
         $stderr.print "#{@progress_bs}#{@failed}#{msg}#{@reset}"
         @columns = 0
       end
@@ -217,14 +219,14 @@ def exec_test(pathes)
     if @count == 0
       $stderr.puts "No tests, no problem"
     else
-      $stderr.puts "#{@passed}PASS#{@reset} all #{@count} tests"
+      $stderr.puts "#{@passed}PASS#{@reset} all #{@count-@tagged} tests (#{@tagged} tagged)"
     end
     exit true
   else
     @errbuf.each do |msg|
       $stderr.puts msg
     end
-    $stderr.puts "#{@failed}FAIL#{@reset} #{@error}/#{@count} tests failed"
+    $stderr.puts "#{@failed}FAIL#{@reset} #{@error}/#{@count-@tagged} tests failed (#{@tagged} tagged)"
     exit false
   end
 end
@@ -269,6 +271,11 @@ def show_progress(message = '')
 end
 
 def assert_check(testsrc, message = '', opt = '', **argh)
+  if argh[:tagged]
+    argh.delete :tagged
+    @tagged += 1
+    return
+  end
   show_progress(message) {
     result = get_result_string(testsrc, opt, **argh)
     check_coredump
@@ -288,9 +295,9 @@ def assert_equal(expected, testsrc, message = '', opt = '', **argh)
   }
 end
 
-def assert_match(expected_pattern, testsrc, message = '')
+def assert_match(expected_pattern, testsrc, message = '', **argh)
   newtest
-  assert_check(testsrc, message) {|result|
+  assert_check(testsrc, message, **argh) {|result|
     if expected_pattern =~ result
       nil
     else
@@ -300,9 +307,9 @@ def assert_match(expected_pattern, testsrc, message = '')
   }
 end
 
-def assert_not_match(unexpected_pattern, testsrc, message = '')
+def assert_not_match(unexpected_pattern, testsrc, message = '', **argh)
   newtest
-  assert_check(testsrc, message) {|result|
+  assert_check(testsrc, message, **argh) {|result|
     if unexpected_pattern !~ result
       nil
     else
@@ -321,6 +328,11 @@ def assert_valid_syntax(testsrc, message = '')
 
 def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
   newtest
+  if opt[:tagged]
+    opt.delete :tagged
+    @tagged += 1
+    return
+  end
   message, ignore_signals = rest
   message ||= ''
   show_progress(message) {
@@ -371,9 +383,14 @@ def assert_normal_exit(testsrc, *rest, timeout: nil, **opt)
   }
 end
 
-def assert_finish(timeout_seconds, testsrc, message = '')
+def assert_finish(timeout_seconds, testsrc, message = '', **argh)
   timeout_seconds *= 3 if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled? # for --jit-wait
   newtest
+  if argh[:tagged]
+    argh.delete :tagged
+    @tagged += 1
+    return
+  end
   show_progress(message) {
     faildesc = nil
     filename = make_srcfile(testsrc)

test/bootstraptest/test_insns.rb

@@ -410,11 +410,18 @@ class String; def =~ other; true; end; end
   [ 'opt_call_c_function', 'Struct.new(:x).new.x = true', ],
 ]
 
+def opts(a)
+  opts = {}
+  opts[a.pop] = true if a.last == :tagged
+  opts.merge! a.pop if a.last.is_a?(Hash)
+  [*a, opts]
+end
+
 # normal path
-tests.compact.each {|(insn, expr, *a)| assert_equal 'true', expr, insn, *a }
+tests.compact.each {|(insn, expr, *a)| assert_equal 'true', expr, insn, *opts(a) }
 
 # with trace
 tests.compact.each {|(insn, expr, *a)|
   progn = "set_trace_func(proc{})\n" + expr
-  assert_equal 'true', progn, insn, *a
+  assert_equal 'true', progn, insn, *opts(a)
 }