[pypy-svn] r71790 - in pypy/trunk/pypy/config: . test

[arigo at codespeak.net]

Author: arigo
Date: Fri Mar  5 11:23:40 2010
New Revision: 71790

Modified:
   pypy/trunk/pypy/config/pypyoption.py
   pypy/trunk/pypy/config/test/test_pypyoption.py
Log:
'withshadowtracking' is incompatible with 'withinlineddict'.
Remove it explicitly and fix the test.  It would have been
better if it complained -- now I'm unsure which of the two
options was picked up in my pypy-c test builds...


Modified: pypy/trunk/pypy/config/pypyoption.py
==============================================================================
--- pypy/trunk/pypy/config/pypyoption.py	(original)
+++ pypy/trunk/pypy/config/pypyoption.py	Fri Mar  5 11:23:40 2010
@@ -325,7 +325,6 @@
         config.objspace.opcodes.suggest(CALL_LIKELY_BUILTIN=True)
     if level in ['2', '3', 'jit']:
         config.objspace.opcodes.suggest(CALL_METHOD=True)
-        config.objspace.std.suggest(withshadowtracking=True)
         config.objspace.std.suggest(withrangelist=True)
         config.objspace.std.suggest(withmethodcache=True)
         config.objspace.std.suggest(withprebuiltchar=True)

Modified: pypy/trunk/pypy/config/test/test_pypyoption.py
==============================================================================
--- pypy/trunk/pypy/config/test/test_pypyoption.py	(original)
+++ pypy/trunk/pypy/config/test/test_pypyoption.py	Fri Mar  5 11:23:40 2010
@@ -47,7 +47,7 @@
 def test_set_pypy_opt_level():
     conf = get_pypy_config()
     set_pypy_opt_level(conf, '2')
-    assert conf.objspace.std.withshadowtracking
+    assert conf.objspace.std.withsharingdict
     conf = get_pypy_config()
     set_pypy_opt_level(conf, '0')
     assert not conf.objspace.std.newshortcut