[pypy-svn] r36903 - in pypy/dist: lib-python pypy pypy/doc pypy/jit pypy/jit/codegen pypy/jit/codegen/i386 pypy/jit/codegen/llvm pypy/jit/codegen/ppc pypy/jit/timeshifter/test pypy/lang/prolog/interpreter pypy/tool/build pypy/tool/test pypy/translator/cli pypy/translator/js pypy/translator/jvm pypy/translator/lisp pypy/translator/squeak
hpk at codespeak.net
hpk at codespeak.net
Thu Jan 18 08:02:23 CET 2007
Author: hpk
Date: Thu Jan 18 08:02:18 2007
New Revision: 36903
Modified:
pypy/dist/lib-python/conftest.py
pypy/dist/pypy/conftest.py
pypy/dist/pypy/doc/conftest.py
pypy/dist/pypy/jit/codegen/conftest.py
pypy/dist/pypy/jit/codegen/i386/conftest.py
pypy/dist/pypy/jit/codegen/llvm/conftest.py
pypy/dist/pypy/jit/codegen/ppc/conftest.py
pypy/dist/pypy/jit/conftest.py
pypy/dist/pypy/jit/timeshifter/test/conftest.py
pypy/dist/pypy/lang/prolog/interpreter/conftest.py
pypy/dist/pypy/tool/build/conftest.py
pypy/dist/pypy/tool/test/test_conftest1.py
pypy/dist/pypy/translator/cli/conftest.py
pypy/dist/pypy/translator/js/conftest.py
pypy/dist/pypy/translator/jvm/conftest.py
pypy/dist/pypy/translator/lisp/conftest.py
pypy/dist/pypy/translator/squeak/conftest.py
Log:
adapted to cleanups/changes related to rev 36902
of py lib development.
Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py (original)
+++ pypy/dist/lib-python/conftest.py Thu Jan 18 08:02:18 2007
@@ -33,8 +33,8 @@
# type="string", dest="listpassing",
# help="just display the list of expected-to-pass tests.")
-Option = py.test.Config.Option
-option = py.test.Config.addoptions("compliance testing options",
+Option = py.test.config.Option
+option = py.test.config.addoptions("compliance testing options",
Option('-C', '--compiled', action="store_true",
default=False, dest="use_compiled",
help="use a compiled version of pypy, expected in pypy/bin/pypy-c"),
Modified: pypy/dist/pypy/conftest.py
==============================================================================
--- pypy/dist/pypy/conftest.py (original)
+++ pypy/dist/pypy/conftest.py Thu Jan 18 08:02:18 2007
@@ -11,10 +11,10 @@
# PyPy's command line extra options (these are added
# to py.test's standard options)
#
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("pypy options",
+option = py.test.config.addoptions("pypy options",
Option('--view', action="store_true", dest="view", default=False,
help="view translation tests' flow graphs with Pygame"),
Option('-A', '--runappdirect', action="store_true",
Modified: pypy/dist/pypy/doc/conftest.py
==============================================================================
--- pypy/dist/pypy/doc/conftest.py (original)
+++ pypy/dist/pypy/doc/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,8 +1,8 @@
import py
from py.__.doc.conftest import Directory, DoctestText, ReSTChecker
-Option = py.test.Config.Option
-option = py.test.Config.addoptions("pypy-doc options",
+Option = py.test.config.Option
+option = py.test.config.addoptions("pypy-doc options",
Option('--generate-redirections', action="store_true",
dest="generateredirections",
default=False, help="Generate the redirecting HTML files"),
Modified: pypy/dist/pypy/jit/codegen/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/conftest.py (original)
+++ pypy/dist/pypy/jit/codegen/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,7 +1,7 @@
import py
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("codegen options",
+option = py.test.config.addoptions("codegen options",
Option('--trap', action="store_true", default=False,
dest="trap",
help="generate a breakpoint instruction at the start"))
Modified: pypy/dist/pypy/jit/codegen/i386/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/i386/conftest.py (original)
+++ pypy/dist/pypy/jit/codegen/i386/conftest.py Thu Jan 18 08:02:18 2007
@@ -15,9 +15,9 @@
return super(Directory, self).run()
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("ppc options",
+option = py.test.config.addoptions("ppc options",
Option('--interp', action="store_true", default=False,
dest="interp",
help="run the very slow genc_interp_* tests"),
Modified: pypy/dist/pypy/jit/codegen/llvm/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/llvm/conftest.py (original)
+++ pypy/dist/pypy/jit/codegen/llvm/conftest.py Thu Jan 18 08:02:18 2007
@@ -16,9 +16,9 @@
#
# return super(Directory, self).run()
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("llvm options",
+option = py.test.config.addoptions("llvm options",
Option('--lineno', action="store_true", default=False,
dest="lineno",
help="add linenumbers to the generated code"),
Modified: pypy/dist/pypy/jit/codegen/ppc/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/codegen/ppc/conftest.py (original)
+++ pypy/dist/pypy/jit/codegen/ppc/conftest.py Thu Jan 18 08:02:18 2007
@@ -15,9 +15,9 @@
return super(Directory, self).run()
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("ppc options",
+option = py.test.config.addoptions("ppc options",
Option('--run-interp-tests', action="store_true", default=False,
dest="run_interp_tests",
help=""),
Modified: pypy/dist/pypy/jit/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/conftest.py (original)
+++ pypy/dist/pypy/jit/conftest.py Thu Jan 18 08:02:18 2007
@@ -10,9 +10,9 @@
# if bench.stop():
# break
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("pypy options",
+option = py.test.config.addoptions("pypy options",
Option('--benchmark', action="store_true",
dest="benchmark", default=False,
help="give benchmarks in tests that support it"),
Modified: pypy/dist/pypy/jit/timeshifter/test/conftest.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/test/conftest.py (original)
+++ pypy/dist/pypy/jit/timeshifter/test/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,8 +1,8 @@
import py
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("timeshifter tests options",
+option = py.test.config.addoptions("timeshifter tests options",
Option('--dump', action="store_true", default=False,
dest="use_dump_backend",
help="uses the dump backend, to log the backend operations"),
Modified: pypy/dist/pypy/lang/prolog/interpreter/conftest.py
==============================================================================
--- pypy/dist/pypy/lang/prolog/interpreter/conftest.py (original)
+++ pypy/dist/pypy/lang/prolog/interpreter/conftest.py Thu Jan 18 08:02:18 2007
@@ -2,9 +2,9 @@
rootdir = py.magic.autopath().dirpath()
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("prolog options",
+option = py.test.config.addoptions("prolog options",
Option('--slow', action="store_true", dest="slow", default=False,
help="view translation tests' flow graphs with Pygame"),
)
Modified: pypy/dist/pypy/tool/build/conftest.py
==============================================================================
--- pypy/dist/pypy/tool/build/conftest.py (original)
+++ pypy/dist/pypy/tool/build/conftest.py Thu Jan 18 08:02:18 2007
@@ -3,8 +3,8 @@
ReSTChecker
mypath = py.magic.autopath().dirpath()
-Option = py.test.Config.Option
-option = py.test.Config.addoptions("pypybuilder test options",
+Option = py.test.config.Option
+option = py.test.config.addoptions("pypybuilder test options",
Option('', '--functional',
action="store_true", dest="functional", default=False,
help="run pypybuilder functional tests"
Modified: pypy/dist/pypy/tool/test/test_conftest1.py
==============================================================================
--- pypy/dist/pypy/tool/test/test_conftest1.py (original)
+++ pypy/dist/pypy/tool/test/test_conftest1.py Thu Jan 18 08:02:18 2007
@@ -6,9 +6,9 @@
class TestPyPyTests:
def test_select_interplevel(self):
- config, args = py.test.Config.parse(['-k', 'interplevel'])
+ config = py.test.config._reparse([innertest, '-k', 'interplevel'])
session = TerminalSession(config, py.std.sys.stdout)
- session.main([innertest])
+ session.main()
l = session.getitemoutcomepairs(py.test.Item.Passed)
assert len(l) == 2
for item in l:
@@ -21,9 +21,9 @@
assert item[0].name in ('app_test_something', 'test_method_app')
def test_select_applevel(self):
- config, args = py.test.Config.parse(['-k', 'applevel'])
+ config = py.test.config._reparse([innertest, '-k', 'applevel'])
session = TerminalSession(config, py.std.sys.stdout)
- session.main([innertest])
+ session.main()
l = session.getitemoutcomepairs(py.test.Item.Passed)
assert len(l) == 2
for item in l:
@@ -36,9 +36,10 @@
assert item[0].name in ('test_something', 'test_method')
def XXX_test_appdirect(self):
- config, args = py.test.Config.parse(['-k', 'applevel', '--appdirect', str(innertest)])
+ config = py.test.config._reparse([innertest,
+ '-k', 'applevel', '--appdirect'])
session = TerminalSession(config, py.std.sys.stdout)
- session.main([innertest])
+ session.main()
l = session.getitemoutcomepairs(py.test.Item.Passed)
assert len(l) == 2
for item in l:
Modified: pypy/dist/pypy/translator/cli/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/cli/conftest.py (original)
+++ pypy/dist/pypy/translator/cli/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,8 +1,8 @@
import py
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions\
+option = py.test.config.addoptions\
("pypy-cli options",
Option('--source', action="store_true", dest="source", default=False,
Modified: pypy/dist/pypy/translator/js/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/js/conftest.py (original)
+++ pypy/dist/pypy/translator/js/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,8 +1,8 @@
import py
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("pypy-ojs options",
+option = py.test.config.addoptions("pypy-ojs options",
Option('--use-browser', action="store", dest="browser", type="string",
default="", help="run Javascript tests in your default browser"),
Modified: pypy/dist/pypy/translator/jvm/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/conftest.py (original)
+++ pypy/dist/pypy/translator/jvm/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,8 +1,8 @@
import py
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions(
+option = py.test.config.addoptions(
"pypy-jvm options",
Option('--java', action='store', dest='java', default='java',
Modified: pypy/dist/pypy/translator/lisp/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/lisp/conftest.py (original)
+++ pypy/dist/pypy/translator/lisp/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,7 +1,7 @@
import py
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions('pypy-cl options',
+option = py.test.config.addoptions('pypy-cl options',
Option('--prettyprint', action='store_true', dest='prettyprint',
default=False, help='pretty-print Common Lisp source'))
Modified: pypy/dist/pypy/translator/squeak/conftest.py
==============================================================================
--- pypy/dist/pypy/translator/squeak/conftest.py (original)
+++ pypy/dist/pypy/translator/squeak/conftest.py Thu Jan 18 08:02:18 2007
@@ -1,8 +1,8 @@
import py
-Option = py.test.Config.Option
+Option = py.test.config.Option
-option = py.test.Config.addoptions("pypy-squeak options",
+option = py.test.config.addoptions("pypy-squeak options",
Option('--showsqueak', action="store_true", dest="showsqueak",
default=False, help="don't run squeak headless, for debugging"),
)
More information about the Pypy-commit
mailing list