[pypy-commit] pypy safe-win-mmap: pass tests

mattip noreply at buildbot.pypy.org
Sun Sep 15 00:28:11 CEST 2013


Author: mattip <matti.picus at gmail.com>
Branch: safe-win-mmap
Changeset: r66947:8a67fc795ed9
Date: 2013-09-14 23:11 +0300
http://bitbucket.org/pypy/pypy/changeset/8a67fc795ed9/

Log:	pass tests

diff --git a/rpython/rlib/rmmap.py b/rpython/rlib/rmmap.py
--- a/rpython/rlib/rmmap.py
+++ b/rpython/rlib/rmmap.py
@@ -583,6 +583,7 @@
 
     def getitem(self, index):
         # simplified version, for rpython
+        self.check_valid()
         if index < 0:
             index += self.size
         return self.data[index]
diff --git a/rpython/rtyper/tool/rffi_platform.py b/rpython/rtyper/tool/rffi_platform.py
--- a/rpython/rtyper/tool/rffi_platform.py
+++ b/rpython/rtyper/tool/rffi_platform.py
@@ -844,6 +844,10 @@
             library_dir = ''
             libraries = ['gc64_dll']
             includes = ['gc.h']
+        # since config_external_library does not use a platform kwarg,
+        # somehow using a platform kw arg make the merge fail in
+        # config_external_library
+        platform = None    
     else:
         library_dir = ''
         libraries = ['gc', 'dl']


More information about the pypy-commit mailing list