[pypy-svn] r68636 - in pypy/trunk/pypy/module/pypyjit/test: . loops

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Oct 19 17:03:09 2009
New Revision: 68636

Removed:
   pypy/trunk/pypy/module/pypyjit/test/loops/
Modified:
   pypy/trunk/pypy/module/pypyjit/test/conftest.py
   pypy/trunk/pypy/module/pypyjit/test/test_pypy_c.py
Log:
(cfbolz, pedronis)  some more tests, switch the option to --pypy, kill unused directory



Modified: pypy/trunk/pypy/module/pypyjit/test/conftest.py
==============================================================================
--- pypy/trunk/pypy/module/pypyjit/test/conftest.py	(original)
+++ pypy/trunk/pypy/module/pypyjit/test/conftest.py	Mon Oct 19 17:03:09 2009
@@ -1,5 +1,5 @@
 def pytest_addoption(parser):
     group = parser.addgroup("pypyjit options")
-    group.addoption("--pypy-c", action="store", default=None, dest="pypy_c",
+    group.addoption("--pypy", action="store", default=None, dest="pypy_c",
                     help="the location of the JIT enabled pypy-c")
 

Modified: pypy/trunk/pypy/module/pypyjit/test/test_pypy_c.py
==============================================================================
--- pypy/trunk/pypy/module/pypyjit/test/test_pypy_c.py	(original)
+++ pypy/trunk/pypy/module/pypyjit/test/test_pypy_c.py	Mon Oct 19 17:03:09 2009
@@ -235,6 +235,7 @@
                 i = 0
                 while i < n:
                     a = A()
+                    assert isinstance(a, A)
                     a.x = 2
                     i = i + a.x
                 return i
@@ -242,10 +243,13 @@
                    ([20], 20),
                    ([31], 32))
 
-        bytecode, = self.get_by_bytecode("CALL_FUNCTION")
-        assert not bytecode.get_opnames("call")
-        assert not bytecode.get_opnames("new")
-        assert len(bytecode.get_opnames("guard")) <= 9
+        callA, callisinstance = self.get_by_bytecode("CALL_FUNCTION")
+        assert not callA.get_opnames("call")
+        assert not callA.get_opnames("new")
+        assert len(callA.get_opnames("guard")) <= 9
+        assert not callisinstance.get_opnames("call")
+        assert not callisinstance.get_opnames("new")
+        assert len(callisinstance.get_opnames("guard")) <= 2
 
         bytecode, = self.get_by_bytecode("STORE_ATTR")
         # XXX where does that come from?