[pypy-commit] pypy gc-del: Fix test_newgc.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: gc-del
Changeset: r63682:185c73ab726e
Date: 2013-04-27 13:05 +0200
http://bitbucket.org/pypy/pypy/changeset/185c73ab726e/

Log:	Fix test_newgc.

diff --git a/rpython/memory/test/snippet.py b/rpython/memory/test/snippet.py
--- a/rpython/memory/test/snippet.py
+++ b/rpython/memory/test/snippet.py
@@ -6,7 +6,7 @@
 from rpython.rlib import rgc
 
 
-class SemiSpaceGCTestDefines:
+class SnippetTestDefines:
     large_tests_ok = False
 
     def definestr_finalizer_order(cls):
@@ -176,7 +176,7 @@
         res = self.run('from_objwithfinalizer_to_youngobj')
         assert res == 1
 
-class SemiSpaceGCTests(SemiSpaceGCTestDefines):
+class SnippetTests(SnippetTestDefines):
     # xxx messy
 
     def run(self, name): # for test_gc.py
diff --git a/rpython/memory/test/test_minimark_gc.py b/rpython/memory/test/test_minimark_gc.py
--- a/rpython/memory/test/test_minimark_gc.py
+++ b/rpython/memory/test/test_minimark_gc.py
@@ -9,7 +9,7 @@
 
 WORD = LONG_BIT // 8
 
-class TestMiniMarkGC(GCTest, snippet.SemiSpaceGCTests):
+class TestMiniMarkGC(GCTest, snippet.SnippetTests):
     from rpython.memory.gc.minimark import MiniMarkGC as GCClass
     GC_CAN_MOVE = True
     GC_CAN_SHRINK_ARRAY = True
diff --git a/rpython/translator/c/test/test_newgc.py b/rpython/translator/c/test/test_newgc.py
--- a/rpython/translator/c/test/test_newgc.py
+++ b/rpython/translator/c/test/test_newgc.py
@@ -1261,11 +1261,10 @@
         self.run("gcflag_extra")
 
 
-class TestSemiSpaceGC(UsingFrameworkTest, snippet.SemiSpaceGCTestDefines):
-    gcpolicy = "semispace"
+class MovingGCTests(UsingFrameworkTest, snippet.SnippetTestDefines):
     should_be_moving = True
     GC_CAN_MOVE = True
-    GC_CAN_MALLOC_NONMOVABLE = False
+    GC_CAN_MALLOC_NONMOVABLE = True
     GC_CAN_SHRINK_ARRAY = True
 
     # for snippets
@@ -1432,29 +1431,11 @@
         assert res >= 195
 
 
-class TestGenerationalGC(TestSemiSpaceGC):
-    gcpolicy = "generation"
-    should_be_moving = True
+# ____________________________________________________________________
 
 
-class TestHybridGC(TestGenerationalGC):
-    gcpolicy = "hybrid"
-    should_be_moving = True
-    GC_CAN_MALLOC_NONMOVABLE = True
-
-    def test_gc_set_max_heap_size(self):
-        py.test.skip("not implemented")
-
-
-class TestHybridGCRemoveTypePtr(TestHybridGC):
-    removetypeptr = True
-
-
-class TestMiniMarkGC(TestSemiSpaceGC):
+class TestMiniMarkGC(MovingGCTests):
     gcpolicy = "minimark"
-    should_be_moving = True
-    GC_CAN_MALLOC_NONMOVABLE = True
-    GC_CAN_SHRINK_ARRAY = True
 
     def test_gc_heap_stats(self):
         py.test.skip("not implemented")
@@ -1517,8 +1498,10 @@
         res = self.run("nongc_opaque_attached_to_gc")
         assert res == 0
 
+
 # ____________________________________________________________________
 
+
 class TaggedPointersTest(object):
     taggedpointers = True
 
@@ -1603,9 +1586,6 @@
         return self.smallint + x + 3
 
 
-class TestHybridTaggedPointers(TaggedPointersTest, TestHybridGC):
-    pass
-
-
-class TestMiniMarkGCMostCompact(TaggedPointersTest, TestMiniMarkGC):
+class TestMiniMarkGCTaggedPointersAndRemoveTypePtr(TaggedPointersTest,
+                                                   TestMiniMarkGC):
     removetypeptr = True