[pypy-svn] r66777 - in pypy/branch/use-py1.0.0/pypy/translator: cli jvm

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Aug 11 14:08:10 2009
New Revision: 66777

Modified:
   pypy/branch/use-py1.0.0/pypy/translator/cli/conftest.py
   pypy/branch/use-py1.0.0/pypy/translator/jvm/conftest.py
Log:
adapt more contests

Modified: pypy/branch/use-py1.0.0/pypy/translator/cli/conftest.py
==============================================================================
--- pypy/branch/use-py1.0.0/pypy/translator/cli/conftest.py	(original)
+++ pypy/branch/use-py1.0.0/pypy/translator/cli/conftest.py	Tue Aug 11 14:08:10 2009
@@ -1,19 +1,18 @@
-class ConftestPlugin:
-    def pytest_addoption(self, parser):
-        group = parser.addgroup("pypy-cli options")
-        group.addoption('--source', action="store_true", dest="source", default=False,
-                help="only generate IL source, don't compile")
-        group.addoption('--wd', action="store_true", dest="wd", default=False,
-                help="store temporary files in the working directory")
-        group.addoption('--stdout', action="store_true", dest="stdout", default=False,
-                help="print the generated IL code to stdout, too")
-        group.addoption('--nostop', action="store_true", dest="nostop", default=False,
-                help="don't stop on warning. The generated IL code could not compile")
-        group.addoption('--nowrap', action="store_true", dest="nowrap", default=False,
-                help="don't wrap exceptions but let them to flow out of the entry point")
-        group.addoption('--verify', action="store_true", dest="verify", default=False,
-                help="check that compiled executables are verifiable")
-        group.addoption('--norun', action='store_true', dest="norun", default=False,
-                help="don't run the compiled executable")
-        group.addoption('--trace', action='store_true', dest='trace', default=False,
-                help='Trace execution of generated code')
+def pytest_addoption(parser):
+    group = parser.addgroup("pypy-cli options")
+    group.addoption('--source', action="store_true", dest="source", default=False,
+            help="only generate IL source, don't compile")
+    group.addoption('--wd', action="store_true", dest="wd", default=False,
+            help="store temporary files in the working directory")
+    group.addoption('--stdout', action="store_true", dest="stdout", default=False,
+            help="print the generated IL code to stdout, too")
+    group.addoption('--nostop', action="store_true", dest="nostop", default=False,
+            help="don't stop on warning. The generated IL code could not compile")
+    group.addoption('--nowrap', action="store_true", dest="nowrap", default=False,
+            help="don't wrap exceptions but let them to flow out of the entry point")
+    group.addoption('--verify', action="store_true", dest="verify", default=False,
+            help="check that compiled executables are verifiable")
+    group.addoption('--norun', action='store_true', dest="norun", default=False,
+            help="don't run the compiled executable")
+    group.addoption('--trace', action='store_true', dest='trace', default=False,
+            help='Trace execution of generated code')

Modified: pypy/branch/use-py1.0.0/pypy/translator/jvm/conftest.py
==============================================================================
--- pypy/branch/use-py1.0.0/pypy/translator/jvm/conftest.py	(original)
+++ pypy/branch/use-py1.0.0/pypy/translator/jvm/conftest.py	Tue Aug 11 14:08:10 2009
@@ -1,18 +1,22 @@
-class ConftestPlugin:
-    def pytest_addoption(self, parser):
-        group = parser.addgroup("pypy-jvm options")
-        group.addoption('--java', action='store', dest='java', default='java',
-                help='Define the java executable to use')
-        group.addoption('--javac', action='store', dest='javac', default='javac',
-                help='Define the javac executable to use')
-        group.addoption('--jasmin', action='store', dest='java', default='java',
-                help='Define the jasmin script to use')
-        group.addoption('--noassemble', action='store_true', dest="noasm", default=False,
-                help="don't assemble jasmin files")
-        group.addoption('--package', action='store', dest='package', default='pypy',
-                help='Package to output generated classes into')
-##        group.addoption('--trace', action='store_true', dest='trace', default=False,
-##                help='Trace execution of generated code')
-        group.addoption('--byte-arrays', action='store_true', dest='byte-arrays',
-                default=False, help='Use byte arrays rather than native strings')
+
+def pytest_addoption(parser):
+    group = parser.addgroup("pypy-jvm options")
+    group.addoption('--java', action='store', dest='java', default='java',
+            help='Define the java executable to use')
+    group.addoption('--javac', action='store', dest='javac',
+                    default='javac',
+                    help='Define the javac executable to use')
+    group.addoption('--jasmin', action='store', dest='java', default='java',
+            help='Define the jasmin script to use')
+    group.addoption('--noassemble', action='store_true', dest="noasm",
+                    default=False,
+                    help="don't assemble jasmin files")
+    group.addoption('--package', action='store', dest='package',
+                    default='pypy',
+                    help='Package to output generated classes into')
+
+    group.addoption('--byte-arrays', action='store_true',
+                    dest='byte-arrays',
+                    default=False,
+                    help='Use byte arrays rather than native strings')