[pypy-svn] r52074 - in pypy/branch/jit-refactoring/pypy/jit: . rainbow/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun Mar  2 21:17:49 2008
New Revision: 52074

Modified:
   pypy/branch/jit-refactoring/pypy/jit/conftest.py
   pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py
Log:
enable the llinterp tests, but add a --quicktest option to disable them again


Modified: pypy/branch/jit-refactoring/pypy/jit/conftest.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/conftest.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/conftest.py	Sun Mar  2 21:17:49 2008
@@ -17,7 +17,11 @@
                dest="benchmark", default=False,
                help="give benchmarks in tests that support it"),
     )
-
+option = py.test.config.addoptions("pypy options", 
+        Option('--quicktest', action="store_true",
+               dest="quicktest", default=False,
+               help="only run the tests that take a reasonable amount of time"),
+    )
 
 class Benchmark(object):
     RUN_TIME = 2.0    # repeat the benchmarked loop for two seconds

Modified: pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py
==============================================================================
--- pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py	(original)
+++ pypy/branch/jit-refactoring/pypy/jit/rainbow/test/test_llinterp.py	Sun Mar  2 21:17:49 2008
@@ -1,6 +1,11 @@
-import py; py.test.skip("in-progress")
+import py
+from pypy.jit.conftest import option
 from pypy.jit.rainbow.test import test_portal
 
+if option.quicktest:
+    py.test.skip("slow")
+
+
 
 class TestLLInterpreted(test_portal.TestPortal):
     translate_support_code = True