diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-13 13:27:07 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-13 13:27:07 +0000 |
| commit | a7b5d454667f9926377b9f230b86bc68c7ed2c6c (patch) | |
| tree | dde765297172e03671627888ffa8d38a69322c71 /test/lib | |
| parent | 2ac58e689131e368a0148b05856054c0e04d7409 (diff) | |
* test/lib/test/unit.rb: added test files with `_test` suffix for json
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
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/test/unit.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb index d34e11afa7..dfbccc055c 100644 --- a/test/lib/test/unit.rb +++ b/test/lib/test/unit.rb @@ -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 |