summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/-test-/string/extconf.rb2
-rw-r--r--test/-ext-/string/test_coderange.rb2
-rw-r--r--test/-ext-/string/test_cstr.rb2
-rw-r--r--test/-ext-/string/test_ellipsize.rb2
-rw-r--r--test/-ext-/string/test_enc_associate.rb2
-rw-r--r--test/-ext-/string/test_enc_str_buf_cat.rb2
-rw-r--r--test/-ext-/string/test_modify_expand.rb4
-rw-r--r--test/-ext-/string/test_nofree.rb2
-rw-r--r--test/-ext-/string/test_normalize.rb4
-rw-r--r--test/-ext-/string/test_qsort.rb2
-rw-r--r--test/-ext-/string/test_set_len.rb2
11 files changed, 13 insertions, 13 deletions
diff --git a/ext/-test-/string/extconf.rb b/ext/-test-/string/extconf.rb
index 10d33cbab9..9981a4d603 100644
--- a/ext/-test-/string/extconf.rb
+++ b/ext/-test-/string/extconf.rb
@@ -4,4 +4,4 @@ inits = $srcs.map {|s| File.basename(s, ".*")}
inits.delete("init")
inits.map! {|s|"X(#{s})"}
$defs << "-DTEST_INIT_FUNCS(X)=\"#{inits.join(' ')}\""
-create_makefile("-test-/string/string")
+create_makefile("-test-/string")
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