[pypy-svn] r68720 - in pypy/trunk/pypy/jit: backend/test metainterp/test

[antocuni at codespeak.net]

Author: antocuni
Date: Fri Oct 23 14:48:43 2009
New Revision: 68720

Modified:
   pypy/trunk/pypy/jit/backend/test/support.py
   pypy/trunk/pypy/jit/metainterp/test/test_loop.py
Log:
fix test_dump_storage for cli:

  - cli tests does not support functions that return void, so make it
    returning an int instead

  - be sure that JIT tests see the correct values for the various os.O_* flags



Modified: pypy/trunk/pypy/jit/backend/test/support.py
==============================================================================
--- pypy/trunk/pypy/jit/backend/test/support.py	(original)
+++ pypy/trunk/pypy/jit/backend/test/support.py	Fri Oct 23 14:48:43 2009
@@ -25,6 +25,7 @@
         for arg in args:
             assert isinstance(arg, int)
 
+        self.pre_translation_hook()
         t = self._get_TranslationContext()
         t.config.translation.type_system = self.type_system # force typesystem-specific options
         if listcomp:
@@ -63,8 +64,15 @@
         entry_point_graph = mixlevelann.getgraph(entry_point, [s_list_of_strings],
                                                  annmodel.SomeInteger())
         warmrunnerdesc.finish()
+        self.post_translation_hook()
         return self._compile_and_run(t, entry_point, entry_point_graph, args)
 
+    def pre_translation_hook(self):
+        pass
+
+    def post_translation_hook(self):
+        pass
+
     def check_loops(self, *args, **kwds):
         pass
 
@@ -120,6 +128,14 @@
 class CliCompiledMixin(BaseCompiledMixin):
     type_system = 'ootype'
 
+    def pre_translation_hook(self):
+        from pypy.translator.oosupport.support import patch_os
+        self.olddefs = patch_os()
+
+    def post_translation_hook(self):
+        from pypy.translator.oosupport.support import unpatch_os
+        unpatch_os(self.olddefs) # restore original values
+
     def _compile_and_run(self, t, entry_point, entry_point_graph, args):
         from pypy.translator.cli.test.runtest import compile_graph
         func = compile_graph(entry_point_graph, t, nowrap=True, standalone=True)

Modified: pypy/trunk/pypy/jit/metainterp/test/test_loop.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/test/test_loop.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/test/test_loop.py	Fri Oct 23 14:48:43 2009
@@ -608,7 +608,7 @@
                     jitdriver.can_enter_jit(n=n, i=i)
                     jitdriver.jit_merge_point(n=n, i=i)
                     i += 1
-
+                return i
             res = self.meta_interp(f, [10])
             data = logfile.read() # assert did not crash
         finally: