diff options
Diffstat (limited to 'spec/default.mspec')
-rw-r--r-- | spec/default.mspec | 112 |
1 files changed, 100 insertions, 12 deletions
diff --git a/spec/default.mspec b/spec/default.mspec index 8791058f95..cae5fa374f 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -3,28 +3,47 @@ $VERBOSE = false if (opt = ENV["RUBYOPT"]) and (opt = opt.dup).sub!(/(?:\A|\s)-w(?=\z|\s)/, '') ENV["RUBYOPT"] = opt end + +# Enable constant leak checks by ruby/mspec +ENV["CHECK_CONSTANT_LEAKS"] ||= "true" + require "./rbconfig" unless defined?(RbConfig) +require_relative "../tool/test-coverage" if ENV.key?("COVERAGE") load File.dirname(__FILE__) + '/ruby/default.mspec' -OBJDIR = File.expand_path("spec/ruby/optional/capi/ext") +OBJDIR = File.expand_path("spec/ruby/optional/capi/ext") unless defined?(OBJDIR) class MSpecScript + @testing_ruby = true + builddir = Dir.pwd srcdir = ENV['SRCDIR'] - if !srcdir and File.exist?("#{builddir}/Makefile") then - File.open("#{builddir}/Makefile", "r:US-ASCII") {|f| - f.read[/^\s*srcdir\s*=\s*(.+)/i] and srcdir = $1 - } - end - srcdir = File.expand_path(srcdir) + srcdir ||= File.read("Makefile", encoding: "US-ASCII")[/^\s*srcdir\s*=\s*(.+)/i, 1] rescue nil config = RbConfig::CONFIG # The default implementation to run the specs. set :target, File.join(builddir, "miniruby#{config['exeext']}") set :prefix, File.expand_path('ruby', File.dirname(__FILE__)) - set :flags, %W[ - -I#{srcdir}/lib - #{srcdir}/tool/runruby.rb --archdir=#{Dir.pwd} --extout=#{config['EXTOUT']} - -- - ] + if srcdir + srcdir = File.expand_path(srcdir) + set :flags, %W[ + -I#{srcdir}/lib + #{srcdir}/tool/runruby.rb --archdir=#{builddir} --extout=#{config['EXTOUT']} + -- + ] + end + + # Disable to run for bundled gems in test-spec + set :bundled_gems, (File.readlines("#{srcdir}/gems/bundled_gems").map do |line| + next if /^\s*(?:#|$)/ =~ line + "#{srcdir}/spec/ruby/library/" + line.split.first + end.compact) + set :stdlibs, Dir.glob("#{srcdir}/spec/ruby/library/*") + set :library, get(:stdlibs).to_a - get(:bundled_gems).to_a + + set :files, get(:command_line) + get(:language) + get(:core) + get(:library) + get(:security) + get(:optional) + + if ENV.key?("COVERAGE") + set :excludes, ["Coverage"] + end end module MSpecScript::JobServer @@ -65,3 +84,72 @@ end class MSpecScript prepend JobServer end + +require 'mspec/runner/formatters/dotted' + +class DottedFormatter + prepend Module.new { + BASE = __dir__ + "/ruby/" unless defined?(BASE) + + def initialize(out = nil) + super + if out + @columns = nil + else + columns = ENV["COLUMNS"]&.to_i + @columns = columns&.nonzero? || 80 + end + @dotted = 0 + @loaded = false + @count = 0 + end + + def register + super + MSpec.register :load, self + MSpec.register :unload, self + end + + def after(*) + if @columns + if @dotted == 0 + s = sprintf("%6d ", @count) + print(s) + @dotted += s.size + end + @count +=1 + end + super + if @columns and (@dotted += 1) >= @columns + print "\n" + @dotted = 0 + end + end + + def load(*) + file = MSpec.file || MSpec.files_array.first + @loaded = true + s = "#{file.delete_prefix(BASE)}:" + print s + if @columns + if (@dotted += s.size) >= @columns + print "\n" + @dotted = 0 + else + print " " + @dotted += 1 + end + end + @count = 0 + end + + def unload + super + if @loaded + print "\n" if @dotted > 0 + @dotted = 0 + @loaded = nil + end + end + } +end |