Author: Jean-Paul Calderone <[email protected]>
Branch: py3.5
Changeset: r92173:6eb780259953
Date: 2017-08-18 15:43 -0400
http://bitbucket.org/pypy/pypy/changeset/6eb780259953/
Log: If the machine can be [3-6], allow the suffix to be [3-6].
It's hard to tell but the intent
(https://www.python.org/dev/peps/pep-3149/) seems to be to embed the
machine identifier into the suffix. Therefore, the old version of
the test was broken in asserting that i[4-6]86 machines all turn
into i386 in the suffix. Change the test to accept the other machine
identifiers as well.
diff --git a/lib-python/3/test/test_sysconfig.py
b/lib-python/3/test/test_sysconfig.py
--- a/lib-python/3/test/test_sysconfig.py
+++ b/lib-python/3/test/test_sysconfig.py
@@ -397,9 +397,16 @@
self.assertTrue('linux' in suffix, suffix)
if re.match('(i[3-6]86|x86_64)$', machine):
if ctypes.sizeof(ctypes.c_char_p()) == 4:
- self.assertTrue(suffix.endswith('i386-linux-gnu.so') \
- or suffix.endswith('x86_64-linux-gnux32.so'),
- suffix)
+ self.assertTrue(
+ suffix.endswith((
+ 'i386-linux-gnu.so',
+ 'i486-linux-gnu.so',
+ 'i586-linux-gnu.so',
+ 'i686-linux-gnu.so',
+ 'x86_64-linux-gnux32.so',
+ )),
+ suffix,
+ )
else: # 8 byte pointer size
self.assertTrue(suffix.endswith('x86_64-linux-gnu.so'), suffix)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
