1 files changed, 58 insertions, 15 deletions
diff --git a/spec/default.mspec b/spec/default.mspec
index ac701a2bc9..2dbaeb83d3 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -1,22 +1,65 @@
-load File.dirname(__FILE__) + '/rubyspec/default.mspec'
+# -*- ruby -*-
+$VERBOSE = false
+if (opt = ENV["RUBYOPT"]) and (opt = opt.dup).sub!(/(?:\A|\s)-w(?=\z|\s)/, '')
+  ENV["RUBYOPT"] = opt
+end
+require "./rbconfig" unless defined?(RbConfig)
+load File.dirname(__FILE__) + '/ruby/default.mspec'
+OBJDIR = File.expand_path("spec/ruby/optional/capi/ext")
 class MSpecScript
   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
+end
+
+module MSpecScript::JobServer
+  def cores(max = 1)
+    if max > 1 and /(?:\A|\s)--jobserver-(?:auth|fds)=(\d+),(\d+)/ =~ ENV["MAKEFLAGS"]
+      cores = 1
+      begin
+        r = IO.for_fd($1.to_i(10), "rb", autoclose: false)
+        w = IO.for_fd($2.to_i(10), "wb", autoclose: false)
+        jobtokens = r.read_nonblock(max - 1)
+        cores = jobtokens.size
+        if cores > 0
+          cores += 1
+          jobserver = w
+          w = nil
+          at_exit {
+            jobserver.print(jobtokens)
+            jobserver.close
+          }
+          MSpecScript::JobServer.module_eval do
+            remove_method :cores
+            define_method(:cores) do
+              cores
+            end
+          end
+          return cores
+        end
+      rescue Errno::EBADF
+      ensure
+        r&.close
+        w&.close
+      end
+    end
+    super
+  end
+end
+
+class MSpecScript
+  prepend JobServer
 end