[pypy-svn] r73661 - pypy/branch/cpython-extension/pypy/module/cpyext/test

afa at codespeak.net afa at codespeak.net
Mon Apr 12 01:03:09 CEST 2010


Author: afa
Date: Mon Apr 12 01:03:08 2010
New Revision: 73661

Modified:
   pypy/branch/cpython-extension/pypy/module/cpyext/test/test_cpyext.py
Log:
Fix test_import on Windows: generate .pyd instead of .dll


Modified: pypy/branch/cpython-extension/pypy/module/cpyext/test/test_cpyext.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/module/cpyext/test/test_cpyext.py	(original)
+++ pypy/branch/cpython-extension/pypy/module/cpyext/test/test_cpyext.py	Mon Apr 12 01:03:08 2010
@@ -8,6 +8,8 @@
 from pypy.rpython.lltypesystem import rffi, lltype, ll2ctypes
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 from pypy.translator import platform
+from pypy.translator.gensupp import uniquemodulename
+from pypy.tool.udir import udir
 from pypy.module.cpyext import api
 from pypy.module.cpyext.state import State
 from pypy.module.cpyext.pyobject import Py_DecRef, InvalidPointerException
@@ -54,10 +56,17 @@
         **kwds
         )
     eci = eci.convert_sources_to_files()
+    dirname = (udir/uniquemodulename('module')).ensure(dir=1)
     soname = platform.platform.compile(
         [], eci,
+        outputfilename=str(dirname/modname),
         standalone=False)
-    return str(soname)
+    if sys.platform == 'win32':
+        pydname = soname.new(purebasename=modname, ext='.pyd')
+    else:
+        pydname = soname.new(purebasename=modname, ext='.so')
+    soname.rename(pydname)
+    return str(pydname)
 
 def freeze_refcnts(self):
     state = self.space.fromcache(State)



More information about the Pypy-commit mailing list