From a7b5d454667f9926377b9f230b86bc68c7ed2c6c Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 13 Jul 2016 13:27:07 +0000
Subject: * 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
---
 test/lib/test/unit.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test/lib')

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
-- 
cgit v1.2.3