[pypy-svn] r63710 - pypy/trunk/pypy/module/_lsprof/test

pedronis at codespeak.net pedronis at codespeak.net
Mon Apr 6 12:24:39 CEST 2009


Author: pedronis
Date: Mon Apr  6 12:24:37 2009
New Revision: 63710

Modified:
   pypy/trunk/pypy/module/_lsprof/test/test_cprofile.py
Log:
make before and after translation (with opt) behavior coincide



Modified: pypy/trunk/pypy/module/_lsprof/test/test_cprofile.py
==============================================================================
--- pypy/trunk/pypy/module/_lsprof/test/test_cprofile.py	(original)
+++ pypy/trunk/pypy/module/_lsprof/test/test_cprofile.py	Mon Apr  6 12:24:37 2009
@@ -24,7 +24,7 @@
 
 class AppTestCProfile(object):
 
-    objspace_options = {}
+    objspace_options = {"objspace.opcodes.CALL_METHOD": True} # influences output naming
 
     def setup_class(cls):
         space = gettestobjspace(usemodules=('_lsprof',),
@@ -184,9 +184,9 @@
         2    0.000    0.000    0.140    0.070 profilee.py:84(helper2_indirect)
         8    0.312    0.039    0.400    0.050 profilee.py:88(helper2)
         8    0.064    0.008    0.080    0.010 profilee.py:98(subhelper)
+        4    0.000    0.000    0.000    0.000 {append.*}
+        1    0.000    0.000    0.000    0.000 {disable.*}
        12    0.000    0.000    0.012    0.001 {hasattr.*}
-        4    0.000    0.000    0.000    0.000 {method 'append' of 'list' objects}
-        1    0.000    0.000    0.000    0.000 {method 'disable' of '.*' objects}
         8    0.000    0.000    0.000    0.000 {range.*}
         4    0.000    0.000    0.000    0.000 {sys.exc_info.*}
 
@@ -196,26 +196,26 @@
 expected_output['print_callers'] = """\
    Ordered by: standard name
 
-Function                             *    was called by...
-                                     *        ncalls  tottime  cumtime
-<string>:1(<module>)                 *    <-%(optional_line)s
-profilee.py:110(__getattr__)         *    <-      16    0.016    0.016  profilee.py:98(subhelper)
-                                     *            12    0.012    0.012  {hasattr.*}
-profilee.py:25(testfunc)             *    <-       1    0.270    1.000  <string>:1(<module>)
-profilee.py:35(factorial)            *    <-       1    0.014    0.130  profilee.py:25(testfunc)
-                                     *          20/3    0.130    0.147  profilee.py:35(factorial)
-                                     *             2    0.006    0.040  profilee.py:84(helper2_indirect)
-profilee.py:48(mul)                  *    <-      20    0.020    0.020  profilee.py:35(factorial)
-profilee.py:55(helper)               *    <-       2    0.040    0.600  profilee.py:25(testfunc)
-profilee.py:73(helper1)              *    <-       4    0.116    0.120  profilee.py:55(helper)
-profilee.py:84(helper2_indirect)     *    <-       2    0.000    0.140  profilee.py:55(helper)
-profilee.py:88(helper2)              *    <-       6    0.234    0.300  profilee.py:55(helper)
-                                     *             2    0.078    0.100  profilee.py:84(helper2_indirect)
-profilee.py:98(subhelper)            *    <-       8    0.064    0.080  profilee.py:88(helper2)
+Function                     *    was called by...
+                             *        ncalls  tottime  cumtime
+<string>:1(<module>)         *    <-%(optional_line)s
+profilee.py:110(__getattr__) *    <-      16    0.016    0.016  profilee.py:98(subhelper)
+                             *            12    0.012    0.012  {hasattr.*}
+profilee.py:25(testfunc)     *    <-       1    0.270    1.000  <string>:1(<module>)
+profilee.py:35(factorial)    *    <-       1    0.014    0.130  profilee.py:25(testfunc)
+                             *          20/3    0.130    0.147  profilee.py:35(factorial)
+                             *             2    0.006    0.040  profilee.py:84(helper2_indirect)
+profilee.py:48(mul)          *    <-      20    0.020    0.020  profilee.py:35(factorial)
+profilee.py:55(helper)       *    <-       2    0.040    0.600  profilee.py:25(testfunc)
+profilee.py:73(helper1)      *    <-       4    0.116    0.120  profilee.py:55(helper)
+profilee.py:84(helper2_indirect) *<-       2    0.000    0.140  profilee.py:55(helper)
+profilee.py:88(helper2)      *    <-       6    0.234    0.300  profilee.py:55(helper)
+                             *             2    0.078    0.100  profilee.py:84(helper2_indirect)
+profilee.py:98(subhelper)    *    <-       8    0.064    0.080  profilee.py:88(helper2)
+{append.*}  * <-       4    0.000    0.000  profilee.py:73(helper1)
+{disable.*} * <-
 {hasattr.*}           * <-       4    0.000    0.004  profilee.py:73(helper1)
                       *          8    0.000    0.008  profilee.py:88(helper2)
-{method 'append' .*}  * <-       4    0.000    0.000  profilee.py:73(helper1)
-{method 'disable' .*} * <-
 {range.*}             * <-       8    0.000    0.000  profilee.py:98(subhelper)
 {sys.exc_info.*}      * <-       4    0.000    0.000  profilee.py:73(helper1)
 
@@ -236,8 +236,8 @@
 profilee.py:55(helper)           * ->       4    0.116    0.120  profilee.py:73(helper1)
                                  *          2    0.000    0.140  profilee.py:84(helper2_indirect)
                                  *          6    0.234    0.300  profilee.py:88(helper2)
-profilee.py:73(helper1)          * ->       4    0.000    0.004  {hasattr.*}
-                                 *          4    0.000    0.000  {method 'append' of 'list' objects}
+profilee.py:73(helper1)          * ->       4    0.000    0.000  {append.*}
+                                 *          4    0.000    0.004  {hasattr.*}
                                  *          4    0.000    0.000  {sys.exc_info.*}
 profilee.py:84(helper2_indirect) * ->       2    0.006    0.040  profilee.py:35(factorial)
                                  *          2    0.078    0.100  profilee.py:88(helper2)
@@ -245,9 +245,9 @@
                                  *          8    0.000    0.008  {hasattr.*}
 profilee.py:98(subhelper)        * ->      16    0.016    0.016  profilee.py:110(__getattr__)
                                  *          8    0.000    0.000  {range.*}
+{append.*}  * ->
+{disable.*} * ->
 {hasattr.*}           * ->      12    0.012    0.012  profilee.py:110(__getattr__)
-{method 'append' .*}  * ->
-{method 'disable' .*} * ->
 {range.*}             * ->
 {sys.exc_info.*}      * ->
 



More information about the Pypy-commit mailing list