aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--test/ruby/test_string.rb3
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 88566a807a..b437069e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Oct 6 16:07:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/test_string.rb (test_LSHIFT_neary_long_max): enable
+ only on platforms where string size range is smaller than memory
+ space. this test does not make sense but just wastes memory and
+ time on other platforms, as it is hardly possible that a string
+ size becomes neary LONG_MAX if long size equals pointer size.
+ [ruby-core:65410] [Bug #10325]
+
Mon Oct 6 11:21:21 2014 Martin Duerst <duerst@it.aoyama.ac.jp>
* tool/unicode_norm_gen.rb: Adding/tweaking comments.
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index e8decc0386..d82d2bc59e 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -2270,7 +2270,8 @@ class TestString < Test::Unit::TestCase
rescue NoMemoryError
end
end;
- end
+ end if [0].pack("l!").bytesize < [nil].pack("p").bytesize
+ # enable only when string size range is smaller than memory space
end
class TestString2 < TestString