[pypy-svn] r67767 - pypy/trunk/pypy/rpython/lltypesystem/test

[arigo at codespeak.net]

Author: arigo
Date: Fri Sep 18 15:05:42 2009
New Revision: 67767

Added:
   pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py.merge.tmp
      - copied, changed from r67762, pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/asmgcroot-callback/pypy/rpython/lltypesystem/test/test_lloperation.py
revisions 67691 to 67762:

    ------------------------------------------------------------------------
    r67693 | arigo | 2009-09-15 15:41:17 +0200 (Tue, 15 Sep 2009) | 2 lines
    
    Change the operations "gc_llvm_*" into a single better-named operation.
    
    ------------------------------------------------------------------------
    r67692 | arigo | 2009-09-15 15:38:22 +0200 (Tue, 15 Sep 2009) | 3 lines
    
    A branch in which to try to implement callback support
    in --gcrootfinder=asmgcc.
    
    ------------------------------------------------------------------------


Copied: pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py.merge.tmp (from r67762, pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py)
==============================================================================
--- pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py	(original)
+++ pypy/trunk/pypy/rpython/lltypesystem/test/test_lloperation.py.merge.tmp	Fri Sep 18 15:05:42 2009
@@ -63,6 +63,6 @@
     for opname, llop in LL_OPERATIONS.items():
         if llop.canfold:
             continue
-        if opname.startswith('gc_x_') or opname.startswith('llvm_'):
+        if opname.startswith('gc_x_'):
             continue   # ignore experimental stuff
         assert opname in LL_INTERP_OPERATIONS