diff options
| -rw-r--r-- | ext/objspace/lib/objspace.rb | 8 | ||||
| -rw-r--r-- | test/objspace/test_objspace.rb | 21 |
2 files changed, 20 insertions, 9 deletions
diff --git a/ext/objspace/lib/objspace.rb b/ext/objspace/lib/objspace.rb index 7cd7507891..0298b0646c 100644 --- a/ext/objspace/lib/objspace.rb +++ b/ext/objspace/lib/objspace.rb @@ -36,7 +36,9 @@ module ObjectSpace raise ArgumentError, "wrong output option: #{output.inspect}" end - _dump(obj, out) + ret = _dump(obj, out) + return nil if output == :stdout + ret end @@ -82,6 +84,8 @@ module ObjectSpace raise ArgumentError, "wrong output option: #{output.inspect}" end - _dump_all(out, full, since) + ret = _dump_all(out, full, since) + return nil if output == :stdout + ret end end diff --git a/test/objspace/test_objspace.rb b/test/objspace/test_objspace.rb index b3f7a56e51..230c1d0513 100644 --- a/test/objspace/test_objspace.rb +++ b/test/objspace/test_objspace.rb @@ -318,8 +318,9 @@ class TestObjSpace < Test::Unit::TestCase ObjectSpace.dump_all(output: :stdout) end - dump_my_heap_please + p dump_my_heap_please end; + assert_equal 'nil', output.pop heap = output.find_all { |l| obj = JSON.parse(l) obj['type'] == "IMEMO" && obj['imemo_type'] @@ -335,8 +336,9 @@ class TestObjSpace < Test::Unit::TestCase ObjectSpace.dump_all(output: :stdout, full: true) end - dump_my_heap_please + p dump_my_heap_please end; + assert_equal 'nil', output.pop heap = output.find_all { |l| JSON.parse(l)['type'] == "NONE" } assert_operator heap.length, :>, 0 end @@ -356,8 +358,9 @@ class TestObjSpace < Test::Unit::TestCase ObjectSpace.dump_all(output: :stdout, since: gc_gen) end - dump_my_heap_please + p dump_my_heap_please end; + assert_equal 'nil', output.pop since = output.shift.to_i assert_operator output.size, :>, 0 generations = output.map { |l| JSON.parse(l)["generation"] }.uniq.sort @@ -374,8 +377,9 @@ class TestObjSpace < Test::Unit::TestCase ObjectSpace.dump_all(output: $stdout) end - dump_my_heap_please + p $stdout == dump_my_heap_please end; + assert_equal 'true', output.pop needle = JSON.parse(output.first) addr = needle['address'] found = output.drop(1).find { |l| JSON.parse(l)['address'] == addr } @@ -392,8 +396,9 @@ class TestObjSpace < Test::Unit::TestCase ObjectSpace.dump_all(output: $stdout) end - dump_my_heap_please + p $stdout == dump_my_heap_please end; + assert_equal 'true', output.pop needle = JSON.parse(output.first) addr = needle['class'] found = output.drop(1).find { |l| JSON.parse(l)['address'] == addr } @@ -430,8 +435,9 @@ class TestObjSpace < Test::Unit::TestCase ObjectSpace.dump_all(output: $stdout) end - dump_my_heap_please + p $stdout == dump_my_heap_please end; + assert_equal 'true', output.pop needle = JSON.parse(output.first) addr = needle['address'] found = output.drop(1).find { |l| (JSON.parse(l)['references'] || []).include? addr } @@ -452,8 +458,9 @@ class TestObjSpace < Test::Unit::TestCase ObjectSpace.dump_all(output: :stdout) end - dump_my_heap_please + p dump_my_heap_please end; + assert_equal 'nil', output.pop assert_match(entry, output.grep(/TEST STRING/).join("\n")) end |