From a5beed9ff467be394afc4957f0c9b12765c81743 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jan 2016 09:43:47 +0000
Subject: ext/-test-: reduce feature names

* ext/-test-/**/extconf.rb: bring up extension libraries which
  have same name as the parent directory to reduce feature names.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/-ext-/bug_reporter/test_bug_reporter.rb             | 2 +-
 test/-ext-/funcall/test_passing_block.rb                 | 2 +-
 test/-ext-/iseq_load/test_iseq_load.rb                   | 2 +-
 test/-ext-/load/test_dot_dot.rb                          | 2 +-
 test/-ext-/num2int/test_num2int.rb                       | 2 +-
 test/-ext-/path_to_class/test_path_to_class.rb           | 2 +-
 test/-ext-/test_bug-3571.rb                              | 2 +-
 test/-ext-/test_bug-5832.rb                              | 2 +-
 test/-ext-/typeddata/test_typeddata.rb                   | 2 +-
 test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'test/-ext-')

diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb
index fb37658c92..7bfb660faf 100644
--- a/test/-ext-/bug_reporter/test_bug_reporter.rb
+++ b/test/-ext-/bug_reporter/test_bug_reporter.rb
@@ -14,7 +14,7 @@ class TestBugReporter < Test::Unit::TestCase
     ]
     tmpdir = Dir.mktmpdir
 
-    args = ["--disable-gems", "-r-test-/bug_reporter/bug_reporter",
+    args = ["--disable-gems", "-r-test-/bug_reporter",
             "-C", tmpdir]
     stdin = "register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
     assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
diff --git a/test/-ext-/funcall/test_passing_block.rb b/test/-ext-/funcall/test_passing_block.rb
index fac7eaf953..5112bc0925 100644
--- a/test/-ext-/funcall/test_passing_block.rb
+++ b/test/-ext-/funcall/test_passing_block.rb
@@ -7,7 +7,7 @@ class TestFuncall < Test::Unit::TestCase
       yield(*args) if block
     end
   end
-  require '-test-/funcall/funcall'
+  require '-test-/funcall'
 
   def test_with_funcall2
     ok = nil
diff --git a/test/-ext-/iseq_load/test_iseq_load.rb b/test/-ext-/iseq_load/test_iseq_load.rb
index 7eb8f4bfc8..d193e37a4f 100644
--- a/test/-ext-/iseq_load/test_iseq_load.rb
+++ b/test/-ext-/iseq_load/test_iseq_load.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 
 class TestIseqLoad < Test::Unit::TestCase
-  require '-test-/iseq_load/iseq_load'
+  require '-test-/iseq_load'
   ISeq = RubyVM::InstructionSequence
 
   def test_bug8543
diff --git a/test/-ext-/load/test_dot_dot.rb b/test/-ext-/load/test_dot_dot.rb
index 1b2c871608..f087ff62c0 100644
--- a/test/-ext-/load/test_dot_dot.rb
+++ b/test/-ext-/load/test_dot_dot.rb
@@ -5,7 +5,7 @@ class Test_DotDot < Test::Unit::TestCase
   def test_load_dot_dot
     feature = '[ruby-dev:41774]'
     assert_nothing_raised(LoadError, feature) {
-      require '-test-/load/dot.dot/dot.dot'
+      require '-test-/load/dot.dot'
     }
   end
 end
diff --git a/test/-ext-/num2int/test_num2int.rb b/test/-ext-/num2int/test_num2int.rb
index c00bb56833..5f1f807565 100644
--- a/test/-ext-/num2int/test_num2int.rb
+++ b/test/-ext-/num2int/test_num2int.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
-require '-test-/num2int/num2int'
+require '-test-/num2int'
 
 class TestNum2int < Test::Unit::TestCase
   SHRT_MIN = -32768
diff --git a/test/-ext-/path_to_class/test_path_to_class.rb b/test/-ext-/path_to_class/test_path_to_class.rb
index 57e3a9233a..b67f20b462 100644
--- a/test/-ext-/path_to_class/test_path_to_class.rb
+++ b/test/-ext-/path_to_class/test_path_to_class.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 
 class Test_PathToClass < Test::Unit::TestCase
-  require '-test-/path_to_class/path_to_class'
+  require '-test-/path_to_class'
 
   def test_path_to_class
     bug5691 = '[ruby-core:41410]'
diff --git a/test/-ext-/test_bug-3571.rb b/test/-ext-/test_bug-3571.rb
index dc9c92bd23..c75d2e8523 100644
--- a/test/-ext-/test_bug-3571.rb
+++ b/test/-ext-/test_bug-3571.rb
@@ -16,6 +16,6 @@ SRC
       "-:2:in `start'",
       "-:2:in `<main>'",
     ]
-    assert_in_out_err(%w"-r-test-/bug-3571/bug", src, [], out, bug3571)
+    assert_in_out_err(%w"-r-test-/bug_3571", src, [], out, bug3571)
   end
 end
diff --git a/test/-ext-/test_bug-5832.rb b/test/-ext-/test_bug-5832.rb
index 6812e64e5e..986a3706d8 100644
--- a/test/-ext-/test_bug-5832.rb
+++ b/test/-ext-/test_bug-5832.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: false
-require '-test-/bug-5832/bug'
+require '-test-/bug_5832'
 
 class Test_BUG_5832 < Test::Unit::TestCase
   def test_block_passing
diff --git a/test/-ext-/typeddata/test_typeddata.rb b/test/-ext-/typeddata/test_typeddata.rb
index 058b7b70c5..6f649ca08f 100644
--- a/test/-ext-/typeddata/test_typeddata.rb
+++ b/test/-ext-/typeddata/test_typeddata.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
-require "-test-/typeddata/typeddata"
+require "-test-/typeddata"
 
 class Test_TypedData < Test::Unit::TestCase
   def test_wrong_argtype
diff --git a/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb b/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
index d9fc52ebb2..d7bc827a6e 100644
--- a/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
+++ b/test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 
 class TestWaitForSingleFD < Test::Unit::TestCase
-  require '-test-/wait_for_single_fd/wait_for_single_fd'
+  require '-test-/wait_for_single_fd'
 
   def with_pipe
     r, w = IO.pipe
-- 
cgit v1.2.3