Author: David Schneider <[email protected]>
Branch: arm-backend-2
Changeset: r54204:43c292b41c22
Date: 2012-03-28 11:40 +0000
http://bitbucket.org/pypy/pypy/changeset/43c292b41c22/
Log: fix merge
diff --git a/pypy/jit/backend/test/runner_test.py
b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -1657,6 +1657,7 @@
def test_read_timestamp(self):
if not self.cpu.supports_longlong:
py.test.skip("longlong test")
+ if sys.platform == 'win32':
# so we stretch the time a little bit.
# On my virtual Parallels machine in a 2GHz Core i7 Mac Mini,
# the test starts working at delay == 21670 and stops at 20600000.
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
