Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r60787:d65584f8c928
Date: 2013-01-31 18:19 +0100
http://bitbucket.org/pypy/pypy/changeset/d65584f8c928/
Log: merge heads
diff --git a/lib_pypy/_ctypes_test.py b/lib_pypy/_ctypes_test.py
--- a/lib_pypy/_ctypes_test.py
+++ b/lib_pypy/_ctypes_test.py
@@ -1,6 +1,5 @@
import os, sys
import tempfile
-import gc
def compile_shared():
"""Compile '_ctypes_test.c' into an extension module, and import it
@@ -19,7 +18,7 @@
if sys.platform == 'win32':
ccflags = ['-D_CRT_SECURE_NO_WARNINGS']
else:
- ccflags = ['-fPIC']
+ ccflags = ['-fPIC', '-Wimplicit-function-declaration']
res = compiler.compile([os.path.join(thisdir, '_ctypes_test.c')],
include_dirs=[include_dir],
extra_preargs=ccflags)
@@ -35,10 +34,10 @@
library = os.path.join(thisdir, '..', 'include', 'python27')
if not os.path.exists(library + '.lib'):
# For a local translation
- library = os.path.join(thisdir, '..', 'pypy', 'translator',
- 'goal', 'libpypy-c')
+ library = os.path.join(thisdir, '..', 'pypy', 'goal', 'libpypy-c')
libraries = [library, 'oleaut32']
- extra_ldargs = ['/MANIFEST'] # needed for VC10
+ extra_ldargs = ['/MANIFEST', # needed for VC10
+ '/EXPORT:init_ctypes_test']
else:
libraries = []
extra_ldargs = []
diff --git a/lib_pypy/_testcapi.py b/lib_pypy/_testcapi.py
--- a/lib_pypy/_testcapi.py
+++ b/lib_pypy/_testcapi.py
@@ -34,8 +34,7 @@
library = os.path.join(thisdir, '..', 'include', 'python27')
if not os.path.exists(library + '.lib'):
# For a local translation
- library = os.path.join(thisdir, '..', 'pypy', 'translator',
- 'goal', 'libpypy-c')
+ library = os.path.join(thisdir, '..', 'pypy', 'goal', 'libpypy-c')
libraries = [library, 'oleaut32']
extra_ldargs = ['/MANIFEST', # needed for VC10
'/EXPORT:init_testcapi']
diff --git a/pypy/module/_io/test/test_fileio.py
b/pypy/module/_io/test/test_fileio.py
--- a/pypy/module/_io/test/test_fileio.py
+++ b/pypy/module/_io/test/test_fileio.py
@@ -43,9 +43,10 @@
import _io
import os
raises(IOError, _io.FileIO, self.tmpdir, "rb")
- fd = os.open(self.tmpdir, os.O_RDONLY)
- raises(IOError, _io.FileIO, fd, "rb")
- os.close(fd)
+ if os.name != 'nt':
+ fd = os.open(self.tmpdir, os.O_RDONLY)
+ raises(IOError, _io.FileIO, fd, "rb")
+ os.close(fd)
def test_readline(self):
import _io
diff --git a/rpython/rlib/test/test_rpath.py b/rpython/rlib/test/test_rpath.py
--- a/rpython/rlib/test/test_rpath.py
+++ b/rpython/rlib/test/test_rpath.py
@@ -6,7 +6,7 @@
def test_rabspath_relative(tmpdir):
tmpdir.chdir()
- assert rpath.rabspath('foo') == tmpdir.join('foo')
+ assert rpath.rabspath('foo') == os.path.realpath(str(tmpdir.join('foo')))
@py.test.mark.skipif("IS_WINDOWS")
def test_rabspath_absolute_posix():
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
