[pypy-commit] pypy gc-del: Fixes

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: gc-del
Changeset: r63693:5a165d74f315
Date: 2013-04-27 15:30 +0200
http://bitbucket.org/pypy/pypy/changeset/5a165d74f315/

Log:    Fixes

diff --git a/rpython/translator/c/gcc/test/test_asmgcroot.py 
b/rpython/translator/c/gcc/test/test_asmgcroot.py
--- a/rpython/translator/c/gcc/test/test_asmgcroot.py
+++ b/rpython/translator/c/gcc/test/test_asmgcroot.py
@@ -11,6 +11,7 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
 from rpython.rlib.entrypoint import entrypoint, secondary_entrypoints
 from rpython.rtyper.lltypesystem.lloperation import llop
+from rpython.translator.backendopt.all import backend_optimizations
 
 _MSVC = compiler.name == "msvc"
 _MINGW = compiler.name == "mingw32"
@@ -54,6 +55,7 @@
             a.build_types(f, inputtypes, False)
         a.build_types(main, [s_list_of_strings])
         t.buildrtyper().specialize()
+        backend_optimizations(t)
         t.checkgraphs()
 
         cbuilder = CStandaloneBuilder(t, main, config=config,
@@ -130,8 +132,8 @@
         def define_callback_with_collect(cls):
             return lambda: 0
 
-class TestAsmGCRootWithSemiSpaceGC(AbstractTestAsmGCRoot,
-                                   test_newgc.TestSemiSpaceGC):
+class TestAsmGCRootWithMiniMarkGC(AbstractTestAsmGCRoot,
+                                  test_newgc.TestMiniMarkGC):
     # for the individual tests see
     # ====> ../../test/test_newgc.py
     secondary_entrypoints = []
@@ -227,7 +229,7 @@
         res = self.run('secondary_entrypoint_callback')
         assert res == 4900
 
-class TestAsmGCRootWithSemiSpaceGC_Mingw32(TestAsmGCRootWithSemiSpaceGC):
+class TestAsmGCRootWithMiniMarkGC_Mingw32(TestAsmGCRootWithMiniMarkGC):
     # for the individual tests see
     # ====> ../../test/test_newgc.py
 
@@ -239,11 +241,11 @@
                 'GNU' in os.popen('make --version').read()):
             py.test.skip("mingw32 and MSYS are required for this test")
 
-        test_newgc.TestSemiSpaceGC.setup_class.im_func(cls)
+        test_newgc.TestAsmGCRootWithMiniMarkGC.setup_class.im_func(cls)
 
     @classmethod
     def make_config(cls):
-        config = TestAsmGCRootWithSemiSpaceGC.make_config()
+        config = TestAsmGCRootWithMiniMarkGC.make_config()
         config.translation.cc = 'mingw32'
         return config
 
@@ -254,13 +256,13 @@
     def define_callback_with_collect(cls):
         return lambda: 0
 
-class TestAsmGCRootWithSemiSpaceGC_Shared(TestAsmGCRootWithSemiSpaceGC):
+class TestAsmGCRootWithMiniMarkGC_Shared(TestAsmGCRootWithMiniMarkGC):
     @classmethod
     def make_config(cls):
-        config = TestAsmGCRootWithSemiSpaceGC.make_config()
+        config = TestAsmGCRootWithMiniMarkGC.make_config()
         config.translation.shared = True
         return config
 
-class TestAsmGCRootWithHybridTagged(AbstractTestAsmGCRoot,
-                                    test_newgc.TestHybridTaggedPointers):
+class TestAsmGCRootWithMiniMarkTagged(AbstractTestAsmGCRoot,
+                     test_newgc.TestMiniMarkGCTaggedPointersAndRemoveTypePtr):
     pass
diff --git a/rpython/translator/c/test/test_standalone.py 
b/rpython/translator/c/test/test_standalone.py
--- a/rpython/translator/c/test/test_standalone.py
+++ b/rpython/translator/c/test/test_standalone.py
@@ -841,7 +841,7 @@
 
     def compile(self, entry_point):
         t = TranslationContext(self.config)
-        t.config.translation.gc = "semispace"
+        t.config.translation.gc = "minimark"
         t.config.translation.gcrootfinder = self.gcrootfinder
         t.config.translation.thread = True
         t.buildannotator().build_types(entry_point, [s_list_of_strings])
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit