summaryrefslogtreecommitdiff
path: root/test/ruby/envutil.rb
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-04 15:15:04 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-04 15:15:04 +0000
commita1dd49fd28741da9093601eacf40f190c426fe78 (patch)
treebe5343a096ddedc6d8628741129f55f967d324d4 /test/ruby/envutil.rb
parenta7987d8b95c21ae77946f820db298af003c6f031 (diff)
merge revision(s) r46397: [Backport #10434]
envutil.rb: avoid error on OS X 10.10 * test/ruby/envutil.rb (diagnostic_reports): Mac OS X 10.10 may not create plist file with crash file together. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/envutil.rb')
-rw-r--r--test/ruby/envutil.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index fa130898d6..a6a9f70820 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -192,7 +192,7 @@ module EnvUtil
log = File.read(name) rescue next
if /\AProcess:\s+#{cmd} \[#{pid}\]$/ =~ log
File.unlink(name)
- File.unlink("#{path}/.#{File.basename(name)}.plist")
+ File.unlink("#{path}/.#{File.basename(name)}.plist") rescue nil
return log
end
end