1 files changed, 131 insertions, 14 deletions
diff --git a/spec/default.mspec b/spec/default.mspec
index c4b75f614a..d756dc31ff 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,21 +1,138 @@
-load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
+# -*- ruby -*-
+$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")
+require_relative "../tool/lib/test/jobserver"
+load File.dirname(__FILE__) + '/ruby/default.mspec'
+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
-  config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -r#{builddir}/rbconfig -e 'print RbConfig::CONFIG["#{name}"]'`}
+  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('rubyspec', File.dirname(__FILE__))
-  set :flags, %W[
-    -I#{File.expand_path srcdir}/lib
-    -I#{File.expand_path srcdir}/#{config['EXTOUT']}/common
-    -I#{File.expand_path srcdir}/-
-    #{File.expand_path srcdir}/tool/runruby.rb --archdir=#{Dir.pwd} --extout=#{config['EXTOUT']}
-  ]
+  set :prefix, File.expand_path('ruby', File.dirname(__FILE__))
+  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
+    gem = line.split.first
+    gem = "openstruct" if gem == "ostruct"
+    "#{srcdir}/spec/ruby/library/#{gem}"
+  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
+  def cores(max = 1)
+    MSpecScript::JobServer.remove_method :cores
+    if cores = Test::JobServer.max_jobs(max)
+      MSpecScript::JobServer.define_method(:cores) { cores }
+      return cores
+    end
+    super
+  end
+end
+
+class MSpecScript
+  prepend JobServer
+end
+
+require 'mspec/runner/formatters/dotted'
+
+class DottedFormatter
+  prepend Module.new {
+    BASE = __dir__ + "/ruby/" unless defined?(BASE)
+    COUNT_WIDTH = 6 unless defined?(COUNT_WIDTH)
+
+    def initialize(out = nil)
+      super
+      if out
+        @columns = nil
+      else
+        columns = ENV["COLUMNS"]&.to_i
+        columns = 80 unless columns&.nonzero?
+        w = COUNT_WIDTH + 1
+        round = 20
+        @columns = (columns - w) / round * round + w
+      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("%*d ", COUNT_WIDTH, @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