Author: Armin Rigo <[email protected]>
Branch: py3.6
Changeset: r96892:09a00ce0b2e9
Date: 2019-07-01 13:30 +0200
http://bitbucket.org/pypy/pypy/changeset/09a00ce0b2e9/
Log: hg merge 6d85d83cc17b (step-by-step merging with default)
diff --git a/lib-python/3/ctypes/test/test_loading.py
b/lib-python/3/ctypes/test/test_loading.py
--- a/lib-python/3/ctypes/test/test_loading.py
+++ b/lib-python/3/ctypes/test/test_loading.py
@@ -4,7 +4,6 @@
import unittest
import test.support
from ctypes.util import find_library
-from ctypes.test import xfail
libc_name = None
@@ -82,7 +81,6 @@
self.assertRaises(AttributeError, dll.__getitem__, 1234)
@unittest.skipUnless(os.name == "nt", 'Windows-specific test')
- @xfail
def test_1703286_A(self):
from _ctypes import LoadLibrary, FreeLibrary
# On winXP 64-bit, advapi32 loads at an address that does
@@ -94,7 +92,6 @@
FreeLibrary(handle)
@unittest.skipUnless(os.name == "nt", 'Windows-specific test')
- @xfail
def test_1703286_B(self):
# Since on winXP 64-bit advapi32 loads like described
# above, the (arbitrarily selected) CloseEventLog function
diff --git a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
--- a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
+++ b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
@@ -280,7 +280,7 @@
// this is possible because compiler align to 8 bytes.
//
if (func_addr != 0x0) {
- depth = _write_native_stack((void*)(((uint64_t)func_addr) |
0x1), result, depth, max_depth);
+ depth = _write_native_stack((void*)(((intptr_t)func_addr) |
0x1), result, depth, max_depth);
}
}
diff --git a/rpython/rlib/rvmprof/test/test_file.py
b/rpython/rlib/rvmprof/test/test_file.py
--- a/rpython/rlib/rvmprof/test/test_file.py
+++ b/rpython/rlib/rvmprof/test/test_file.py
@@ -11,10 +11,11 @@
def get_list_of_files(shared):
files = list(shared.visit('*.[ch]'))
# in PyPy we checkin the result of ./configure; as such, these files are
- # not in github and can be skipped
+ # not in github or different and can be skipped
files.remove(shared.join('libbacktrace', 'config-x86_32.h'))
files.remove(shared.join('libbacktrace', 'config-x86_64.h'))
files.remove(shared.join('libbacktrace', 'gstdint.h'))
+ files.remove(shared.join('libbacktrace', 'config.h'))
return files
def test_same_file():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
