[pypy-commit] pypy win64 test: buildbot problem partially solved: sys.maxint is now also hacked when called by the buildbot (which uses pytest, not the test_all

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: win64 test
Changeset: r49356:ae3f08719461
Date: 2011-11-12 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/ae3f08719461/

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/rlib/rbigint.py b/pypy/rlib/rbigint.py
--- a/pypy/rlib/rbigint.py
+++ b/pypy/rlib/rbigint.py
@@ -45,7 +45,7 @@
 
 def _mask_digit(x):
     if not we_are_translated():
-        assert type(x) is not long, "overflow occurred!"
+        assert abs(x) , "overflow occurred!"
     return intmask(x & MASK)
 _mask_digit._annspecialcase_ = 'specialize:argtype(0)'
 
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,6 +4,12 @@
 """
 __all__ = ['main']
 
+# 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.core import main, UsageError, _preloadplugins
 from _pytest import core as cmdline
 from _pytest import __version__