Author: Hakan Ardo <[email protected]>
Branch: jit-optimizeopt-cleanups
Changeset: r47785:8ab3accea25a
Date: 2011-10-03 08:24 +0200
http://bitbucket.org/pypy/pypy/changeset/8ab3accea25a/
Log: failing test
diff --git a/pypy/jit/metainterp/test/test_string.py
b/pypy/jit/metainterp/test/test_string.py
--- a/pypy/jit/metainterp/test/test_string.py
+++ b/pypy/jit/metainterp/test/test_string.py
@@ -484,6 +484,30 @@
return len(sa.val)
assert self.meta_interp(f, ['a']) == f('a')
+ def test_string_comepare_quasiimmutable(self):
+ class Sys(object):
+ _immutable_fields_ = ["defaultencoding?"]
+ def __init__(self, s):
+ self.defaultencoding = s
+ _str = self._str
+ sys = Sys(_str('ascii'))
+ mydriver = JitDriver(reds = ['n', 'sa'], greens = [])
+ def f(n):
+ sa = 0
+ sys.defaultencoding = _str('ascii')
+ while n:
+ mydriver.jit_merge_point(n=n, sa=sa)
+ if sys.defaultencoding == _str('ascii'):
+ sa += 1
+ n -= 1
+ sys.defaultencoding = _str('utf-8')
+ return sa
+ assert self.meta_interp(f, [8]) == f(8)
+ self.check_loops({'int_add': 1, 'guard_true': 1, 'int_sub': 1,
+ 'jump': 1, 'int_is_true': 1,
+ 'guard_not_invalidated': 1})
+
+
#class TestOOtype(StringTests, OOJitMixin):
# CALL = "oosend"
# CALL_PURE = "oosend_pure"
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -50,8 +50,7 @@
cmdline.append(str(self.filepath))
#
print cmdline, logfile
- env={'PYPYLOG': 'jit-log-opt,jit-summary:' + str(logfile)}
- #env={'PYPYLOG': ':' + str(logfile)}
+ env={'PYPYLOG': 'jit-log-opt,jit-log-noopt,jit-summary:' +
str(logfile)}
pipe = subprocess.Popen(cmdline,
env=env,
stdout=subprocess.PIPE,
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
