summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2023-06-25 12:29:49 +0900
committernagachika <nagachika@ruby-lang.org>2023-06-25 12:29:49 +0900
commite3d10dedf106357d2b17fc8786d35035e0b366cf (patch)
treea80e7c918b878f8b0b164db83f0c471c6e962f70
parent3ebcbb537d7ae37e49c49e05b28d2cc5b324f151 (diff)
merge revision(s) bffadcd6d46ccfccade79ce0efb60ced8eac4483: [Backport #19529]
Add guard to compaction test in WeakMap Some platforms don't support compaction, so we should skip this test. --- test/ruby/test_weakmap.rb | 2 ++ 1 file changed, 2 insertions(+)
-rw-r--r--test/ruby/test_weakmap.rb2
-rw-r--r--version.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/test/ruby/test_weakmap.rb b/test/ruby/test_weakmap.rb
index 9bbe2d6b81..6455034743 100644
--- a/test/ruby/test_weakmap.rb
+++ b/test/ruby/test_weakmap.rb
@@ -178,6 +178,8 @@ class TestWeakMap < Test::Unit::TestCase
end
def test_compaction_bug_19529
+ omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
obj = Object.new
100.times do |i|
GC.compact
diff --git a/version.h b/version.h
index 673864d759..3efe8f06d7 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 56
+#define RUBY_PATCHLEVEL 57
#include "ruby/version.h"
#include "ruby/internal/abi.h"