[pypy-svn] r5002 - pypy/branch/src-newobjectmodel/pypy/tool

[arigo at codespeak.net]

Author: arigo
Date: Sun Jun  6 15:04:52 2004
New Revision: 5002

Added:
   pypy/branch/src-newobjectmodel/pypy/tool/bltinchecker.py
      - copied unchanged from r5001, pypy/trunk/src/pypy/tool/bltinchecker.py
Modified:
   pypy/branch/src-newobjectmodel/pypy/tool/option.py
   pypy/branch/src-newobjectmodel/pypy/tool/testit.py
Log:
svn merge -r4824:HEAD ~/svn/pypy/trunk/src
where HEAD=5001


Modified: pypy/branch/src-newobjectmodel/pypy/tool/option.py
==============================================================================
--- pypy/branch/src-newobjectmodel/pypy/tool/option.py	(original)
+++ pypy/branch/src-newobjectmodel/pypy/tool/option.py	Sun Jun  6 15:04:52 2004
@@ -25,6 +25,8 @@
         '-T', action="callback",
         callback=objspace_callback, callback_args=("trivial",),
         help="run in trivial object space"))
+    """
+    unneeded options that don't even make sense any more?
     options.append(make_option(
         '-P', action="callback",
         callback=objspace_callback, callback_args=("trace",),
@@ -33,6 +35,7 @@
         '-A', action="callback",
         callback=objspace_callback, callback_args=("ann",),
         help="run in annotation object space"))
+    """
     options.append(make_option(
         '-v', action="count", dest="verbose",
         help="verbose"))

Modified: pypy/branch/src-newobjectmodel/pypy/tool/testit.py
==============================================================================
--- pypy/branch/src-newobjectmodel/pypy/tool/testit.py	(original)
+++ pypy/branch/src-newobjectmodel/pypy/tool/testit.py	Sun Jun  6 15:04:52 2004
@@ -357,7 +357,7 @@
         Options.spacename = spacename
 
     warnings.defaultaction = Options.showwarning and 'default' or 'ignore'
-    print >> sys.stderr, "running tests via", repr(objspace())
+    #print >> sys.stderr, "running tests via", repr(objspace())
     runner.run(suite)
 
 def main(root=None):