From 5d210501825e1682e68cbfc2be424fc339f382fa Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Fri, 28 Feb 2020 19:07:14 +0100 Subject: Update to ruby/mspec@a514ad7 --- spec/mspec/lib/mspec/helpers/tmp.rb | 8 +++----- spec/mspec/lib/mspec/runner/parallel.rb | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'spec/mspec/lib') diff --git a/spec/mspec/lib/mspec/helpers/tmp.rb b/spec/mspec/lib/mspec/helpers/tmp.rb index 1677fb4f14..5062991d63 100644 --- a/spec/mspec/lib/mspec/helpers/tmp.rb +++ b/spec/mspec/lib/mspec/helpers/tmp.rb @@ -3,11 +3,9 @@ # should clean up any temporary files created so that the temp # directory is empty when the process exits. -SPEC_TEMP_DIR = File.expand_path(ENV["SPEC_TEMP_DIR"] || "rubyspec_temp") - -SPEC_TEMP_UNIQUIFIER = "0" - SPEC_TEMP_DIR_PID = Process.pid +SPEC_TEMP_DIR = File.expand_path(ENV["SPEC_TEMP_DIR"] || "rubyspec_temp/#{SPEC_TEMP_DIR_PID}") +SPEC_TEMP_UNIQUIFIER = "0" at_exit do begin @@ -31,7 +29,7 @@ all specs are cleaning up temporary files: end def tmp(name, uniquify = true) - Dir.mkdir SPEC_TEMP_DIR unless Dir.exist? SPEC_TEMP_DIR + mkdir_p SPEC_TEMP_DIR unless Dir.exist? SPEC_TEMP_DIR if uniquify and !name.empty? slash = name.rindex "/" diff --git a/spec/mspec/lib/mspec/runner/parallel.rb b/spec/mspec/lib/mspec/runner/parallel.rb index 7428b33682..6a9ecd155d 100644 --- a/spec/mspec/lib/mspec/runner/parallel.rb +++ b/spec/mspec/lib/mspec/runner/parallel.rb @@ -15,7 +15,7 @@ class ParallelRunner @output_files << name env = { - "SPEC_TEMP_DIR" => "rubyspec_temp_#{i}", + "SPEC_TEMP_DIR" => "#{SPEC_TEMP_DIR}_#{i}", "MSPEC_MULTI" => i.to_s } command = @argv + ["-fy", "-o", name] -- cgit v1.2.3