Author: Brian Kearns <[email protected]>
Branch:
Changeset: r60574:f35e9b243a35
Date: 2013-01-27 20:21 -0800
http://bitbucket.org/pypy/pypy/changeset/f35e9b243a35/
Log: more darwin test fixes
diff --git a/pypy/module/cpyext/test/test_cpyext.py
b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -49,6 +49,8 @@
kwds["libraries"] = [api_library]
# '%s' undefined; assuming extern returning int
kwds["compile_extra"] = ["/we4013"]
+ elif sys.platform == 'darwin':
+ kwds["link_files"] = [str(api_library + '.dylib')]
else:
kwds["link_files"] = [str(api_library + '.so')]
if sys.platform.startswith('linux'):
diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py
--- a/rpython/rlib/test/test_rposix.py
+++ b/rpython/rlib/test/test_rposix.py
@@ -117,7 +117,7 @@
curdir = os.getcwd()
try:
interpret(f, [])
- assert os.getcwdu() == self.ufilename
+ assert os.getcwdu() == os.path.realpath(self.ufilename)
finally:
os.chdir(curdir)
diff --git a/rpython/translator/c/test/test_extfunc.py
b/rpython/translator/c/test/test_extfunc.py
--- a/rpython/translator/c/test/test_extfunc.py
+++ b/rpython/translator/c/test/test_extfunc.py
@@ -316,7 +316,7 @@
return os.getcwd()
f1 = compile(does_stuff, [str])
# different on windows please
- assert f1('/tmp') == '/tmp'
+ assert f1('/tmp') == os.path.realpath('/tmp')
def test_mkdir_rmdir():
def does_stuff(path, delete):
diff --git a/rpython/translator/platform/test/test_posix.py
b/rpython/translator/platform/test/test_posix.py
--- a/rpython/translator/platform/test/test_posix.py
+++ b/rpython/translator/platform/test/test_posix.py
@@ -41,7 +41,8 @@
if self.strict_on_stderr:
assert res.err == ''
assert res.returncode == 0
- assert '-lrt' in tmpdir.join("Makefile").read()
+ if sys.platform.startswith('linux'):
+ assert '-lrt' in tmpdir.join("Makefile").read()
def test_link_files(self):
tmpdir = udir.join('link_files' +
self.__class__.__name__).ensure(dir=1)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
