Author: Christian Tismer <[email protected]>
Branch: win64-stage1
Changeset: r49357:30f9db926aa8
Date: 2011-11-12 13:20 +0100
http://bitbucket.org/pypy/pypy/changeset/30f9db926aa8/
Log: buildbot problem partially solved: sys.maxint is now also hacked
when called by the buildbot (which uses pytest, not the test_all
diff --git a/pypy/test_all.py b/pypy/test_all.py
--- a/pypy/test_all.py
+++ b/pypy/test_all.py
@@ -10,10 +10,6 @@
For more information, use test_all.py -h.
"""
import sys, os
-# XXX hack for win64:
-# this needs to be done without hacking maxint
-if hasattr(sys, "maxsize"):
- sys.maxint = max(sys.maxint, sys.maxsize)
if len(sys.argv) == 1 and os.path.dirname(sys.argv[0]) in '.':
print >> sys.stderr, __doc__
diff --git a/pytest.py b/pytest.py
--- a/pytest.py
+++ b/pytest.py
@@ -4,7 +4,12 @@
"""
__all__ = ['main']
-from _pytest.core import main, UsageError, _preloadplugins
+# XXX hack for win64:
+# this needs to be done without hacking maxint
+import sys
+if hasattr(sys, "maxsize"):
+ sys.maxint = max(sys.maxint, sys.maxsize)
+
from _pytest import core as cmdline
from _pytest import __version__
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
