diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-25 23:31:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-25 23:31:22 +0000 |
commit | 463a42a7fadd766d50b053a2348f8da015eeee5f (patch) | |
tree | 3861db540044ece1f1b7ba8ee13bae1ef5a1e734 | |
parent | 70cd1db83b120d93446d731b565d8109e2169a00 (diff) | |
download | ruby-463a42a7fadd766d50b053a2348f8da015eeee5f.tar.gz |
Expand spec files to realpaths
* spec/mspec/lib/mspec/utils/script.rb (MSpecScript#entries): expand
the given spec path to the realpath, not to require a library by
realpath and symbolic link path from the spec file.
reapply r64749 and r64751 overridden by r64830.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | spec/mspec/lib/mspec/utils/script.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb index db5a33a91a..2816618b0f 100644 --- a/spec/mspec/lib/mspec/utils/script.rb +++ b/spec/mspec/lib/mspec/utils/script.rb @@ -189,7 +189,11 @@ class MSpecScript end patterns.each do |pattern| - expanded = File.expand_path(pattern) + begin + expanded = File.realpath(pattern) + rescue Errno::ENOENT + next + end if File.file?(expanded) && expanded.end_with?('.rb') return [expanded] elsif File.directory?(expanded) |