[前][次][番号順一覧][スレッド一覧]

ruby-changes:60993

From: Benoit <ko1@a...>
Date: Sun, 3 May 2020 19:29:42 +0900 (JST)
Subject: [ruby-changes:60993] f646d20aae (master): Update to ruby/mspec@d419d0b

https://git.ruby-lang.org/ruby.git/commit/?id=f646d20aae

From f646d20aaeb8f02bcd3d0c5c3f5a372da654502a Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@g...>
Date: Sun, 3 May 2020 12:28:27 +0200
Subject: Update to ruby/mspec@d419d0b


diff --git a/spec/mspec/lib/mspec/helpers/tmp.rb b/spec/mspec/lib/mspec/helpers/tmp.rb
index 5062991..b2a38ee 100644
--- a/spec/mspec/lib/mspec/helpers/tmp.rb
+++ b/spec/mspec/lib/mspec/helpers/tmp.rb
@@ -4,7 +4,14 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/helpers/tmp.rb#L4
 # directory is empty when the process exits.
 
 SPEC_TEMP_DIR_PID = Process.pid
-SPEC_TEMP_DIR = File.expand_path(ENV["SPEC_TEMP_DIR"] || "rubyspec_temp/#{SPEC_TEMP_DIR_PID}")
+
+if spec_temp_dir = ENV["SPEC_TEMP_DIR"]
+  spec_temp_dir = File.realdirpath(spec_temp_dir)
+else
+  spec_temp_dir = "#{File.realpath(Dir.pwd)}/rubyspec_temp/#{SPEC_TEMP_DIR_PID}"
+end
+SPEC_TEMP_DIR = spec_temp_dir
+
 SPEC_TEMP_UNIQUIFIER = "0"
 
 at_exit do
diff --git a/spec/mspec/spec/fixtures/my_ruby b/spec/mspec/spec/fixtures/my_ruby
index 4d552f2..eeda3ee 100755
--- a/spec/mspec/spec/fixtures/my_ruby
+++ b/spec/mspec/spec/fixtures/my_ruby
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/fixtures/my_ruby#L1
 #!/usr/bin/env bash
 
 echo $RUBY_EXE
-ruby "$@"
+exec ruby "$@"
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]