diff options
| author | Benoit Daloze <eregontp@gmail.com> | 2020-02-28 19:07:14 +0100 |
|---|---|---|
| committer | Benoit Daloze <eregontp@gmail.com> | 2020-02-28 19:07:14 +0100 |
| commit | 5d210501825e1682e68cbfc2be424fc339f382fa (patch) | |
| tree | abf43e46637e66d9a6967954a7db175884143a67 /spec/mspec/lib | |
| parent | a8687f3ef81f98a0e10a0c263b8334bc2ba3743e (diff) | |
Update to ruby/mspec@a514ad7
Diffstat (limited to 'spec/mspec/lib')
| -rw-r--r-- | spec/mspec/lib/mspec/helpers/tmp.rb | 8 | ||||
| -rw-r--r-- | spec/mspec/lib/mspec/runner/parallel.rb | 2 |
2 files changed, 4 insertions, 6 deletions
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] |