archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* test/lib/test/unit.rb: added test files with _test suffix for json

Browse source 
upstream.
* test/json: merge original test files from json upstream.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2016-07-13 13:27:07 +00:00
parent 2ac58e6891
commit a7b5d45466
13 changed files with 43 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/lib/test/unit.rb
View file

@ -756,6 +756,7 @@ module Test
module GlobOption # :nodoc: all
@@testfile_prefix = "test"
@@testfile_suffix = "test"
def setup_options(parser, options)
super
@ -782,7 +783,7 @@ module Test
next if f.empty?
path = f
end
if !(match = Dir["#{path}/**/#{@@testfile_prefix}_*.rb"]).empty?
if !(match = (Dir["#{path}/**/#{@@testfile_prefix}_*.rb"] + Dir["#{path}/**/*_#{@@testfile_suffix}.rb"]).uniq).empty?
if reject
match.reject! {|n|
n[(prefix.length+1)..-1] if prefix