diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-03 05:22:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-09-03 05:22:41 +0000 |
| commit | d41838c8d4c5b6fe956b07ade79f2d4954fd7c68 (patch) | |
| tree | 64545ce620ffccff70889a014ef907edc8c1411e | |
| parent | 58431c659530f7be27138abbd802dd42c1acdb5d (diff) | |
common.mk: exclude memory leak tests
* common.mk (TEST_EXCLUDES): exclude tests for memory leak, often
too expensive and/or false-positive.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | test/excludes/TestConst.rb | 1 | ||||
| -rw-r--r-- | test/ruby/test_hash.rb | 2 | ||||
| -rw-r--r-- | test/test_weakref.rb | 2 |
4 files changed, 3 insertions, 4 deletions
@@ -143,7 +143,7 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' $(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE) TESTSDIR = $(srcdir)/test -TEST_EXCLUDES = --excludes=$(TESTSDIR)/excludes +TEST_EXCLUDES = --excludes=$(TESTSDIR)/excludes -x /memory_leak/ TESTWORKDIR = testwork TESTOPTS = $(RUBY_TESTOPTS) diff --git a/test/excludes/TestConst.rb b/test/excludes/TestConst.rb deleted file mode 100644 index 14eea5be3e..0000000000 --- a/test/excludes/TestConst.rb +++ /dev/null @@ -1 +0,0 @@ -exclude :test_redefinition_memory_leak, 'often too expensive' diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 076f76fe85..e8d3d21484 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1232,7 +1232,7 @@ class TestHash < Test::Unit::TestCase end end - def test_exception_in_rehash + def test_exception_in_rehash_memory_leak return unless @cls == Hash bug9187 = '[ruby-core:58728] [Bug #9187]' diff --git a/test/test_weakref.rb b/test/test_weakref.rb index d21b431abb..9f671f4e22 100644 --- a/test/test_weakref.rb +++ b/test/test_weakref.rb @@ -61,7 +61,7 @@ class TestWeakRef < Test::Unit::TestCase }, bug7304 end - def test_repeated_object_leak + def test_repeated_object_memory_leak bug10537 = '[ruby-core:66428]' assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537, timeout: 60) a = Object.new |