From daf7b1e479d2dcf161f4dda4239f6067ba9b7b13 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Jul 2015 03:56:17 +0000
Subject: -test-/string: move

* ext/-test-/string/extconf.rb: move "-test-/string/string.so" to
  "-test-/string.so".

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/-ext-/string/test_coderange.rb       | 2 +-
 test/-ext-/string/test_cstr.rb            | 2 +-
 test/-ext-/string/test_ellipsize.rb       | 2 +-
 test/-ext-/string/test_enc_associate.rb   | 2 +-
 test/-ext-/string/test_enc_str_buf_cat.rb | 2 +-
 test/-ext-/string/test_modify_expand.rb   | 4 ++--
 test/-ext-/string/test_nofree.rb          | 2 +-
 test/-ext-/string/test_normalize.rb       | 4 ++--
 test/-ext-/string/test_qsort.rb           | 2 +-
 test/-ext-/string/test_set_len.rb         | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'test')

diff --git a/test/-ext-/string/test_coderange.rb b/test/-ext-/string/test_coderange.rb
index 83cebf19c0..31f5c871f5 100644
--- a/test/-ext-/string/test_coderange.rb
+++ b/test/-ext-/string/test_coderange.rb
@@ -1,6 +1,6 @@
 # coding: ascii-8bit
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 require "rbconfig/sizeof"
 
 class Test_StringCoderange < Test::Unit::TestCase
diff --git a/test/-ext-/string/test_cstr.rb b/test/-ext-/string/test_cstr.rb
index 272e090955..1e973d0a39 100644
--- a/test/-ext-/string/test_cstr.rb
+++ b/test/-ext-/string/test_cstr.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 
 class Test_StringCStr < Test::Unit::TestCase
   Bug4319 = '[ruby-dev:43094]'
diff --git a/test/-ext-/string/test_ellipsize.rb b/test/-ext-/string/test_ellipsize.rb
index 2c14c0cf84..23ccdb515b 100644
--- a/test/-ext-/string/test_ellipsize.rb
+++ b/test/-ext-/string/test_ellipsize.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 
 class Test_StringEllipsize < Test::Unit::TestCase
   def setup
diff --git a/test/-ext-/string/test_enc_associate.rb b/test/-ext-/string/test_enc_associate.rb
index edddfb4316..9e9c14820d 100644
--- a/test/-ext-/string/test_enc_associate.rb
+++ b/test/-ext-/string/test_enc_associate.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 
 class Test_StrEncAssociate < Test::Unit::TestCase
   def test_frozen
diff --git a/test/-ext-/string/test_enc_str_buf_cat.rb b/test/-ext-/string/test_enc_str_buf_cat.rb
index 9582fe268c..c925affb41 100644
--- a/test/-ext-/string/test_enc_str_buf_cat.rb
+++ b/test/-ext-/string/test_enc_str_buf_cat.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 
 class Test_StringEncStrBufCat < Test::Unit::TestCase
   Bug6509 = '[ruby-dev:45688]'
diff --git a/test/-ext-/string/test_modify_expand.rb b/test/-ext-/string/test_modify_expand.rb
index 34b7be7bba..cc19a47b91 100644
--- a/test/-ext-/string/test_modify_expand.rb
+++ b/test/-ext-/string/test_modify_expand.rb
@@ -1,9 +1,9 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 
 class Test_StringModifyExpand < Test::Unit::TestCase
   def test_modify_expand_memory_leak
-    assert_no_memory_leak(["-r-test-/string/string"],
+    assert_no_memory_leak(["-r-test-/string"],
                           <<-PRE, <<-CMD, "rb_str_modify_expand()", limit: 2.5)
       s=Bug::String.new
     PRE
diff --git a/test/-ext-/string/test_nofree.rb b/test/-ext-/string/test_nofree.rb
index fe2bf6b792..cb034a4b8f 100644
--- a/test/-ext-/string/test_nofree.rb
+++ b/test/-ext-/string/test_nofree.rb
@@ -4,7 +4,7 @@ class Test_StringNoFree < Test::Unit::TestCase
   def test_no_memory_leak
     bug10942 = '[ruby-core:68436] [Bug #10942] no leak on nofree string'
     code = '.times {Bug::String.nofree << "a" * 100}'
-    assert_no_memory_leak(%w(-r-test-/string/string),
+    assert_no_memory_leak(%w(-r-test-/string),
                           "100_000#{code}",
                           "1_000_000#{code}",
                           bug10942, rss: true)
diff --git a/test/-ext-/string/test_normalize.rb b/test/-ext-/string/test_normalize.rb
index 83bbfd3011..b270a45005 100644
--- a/test/-ext-/string/test_normalize.rb
+++ b/test/-ext-/string/test_normalize.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 require "tempfile"
 
 class Test_StringNormalize < Test::Unit::TestCase
@@ -102,7 +102,7 @@ class Test_StringNormalize < Test::Unit::TestCase
   end
 
   def test_invalid_sequence
-    assert_separately(%w[-r-test-/string/string], <<-'end;')
+    assert_separately(%w[-r-test-/string], <<-'end;')
       assert_equal("\u{fffd}", Bug::String.new("\xff").normalize_ospath)
     end;
   end
diff --git a/test/-ext-/string/test_qsort.rb b/test/-ext-/string/test_qsort.rb
index 3a58523200..1a6dae0124 100644
--- a/test/-ext-/string/test_qsort.rb
+++ b/test/-ext-/string/test_qsort.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 
 class Test_StringQSort < Test::Unit::TestCase
   def test_qsort
diff --git a/test/-ext-/string/test_set_len.rb b/test/-ext-/string/test_set_len.rb
index e257cacb83..198129d72f 100644
--- a/test/-ext-/string/test_set_len.rb
+++ b/test/-ext-/string/test_set_len.rb
@@ -1,5 +1,5 @@
 require 'test/unit'
-require "-test-/string/string"
+require "-test-/string"
 
 class Test_StrSetLen < Test::Unit::TestCase
   def setup
-- 
cgit v1.2.3