diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:09:43 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:09:43 +0000 |
| commit | 6d1d733828b49eb03d45da81c6b8c6b849fbc5df (patch) | |
| tree | b0b120d6c527fb8cf6e4a0f175556611673ad780 /Lib/test/test_sysconfig.py | |
| parent | 357e8cdc9b1c5a99be9ade2b1070c38d50ddadc6 (diff) | |
| parent | 23282e54fdd766945930006ab606641a2db37a4c (diff) | |
| download | cpython-6d1d733828b49eb03d45da81c6b8c6b849fbc5df.tar.gz | |
Issues #29349: Merge Py 2 fix 3.5
Diffstat (limited to 'Lib/test/test_sysconfig.py')
| -rw-r--r-- | Lib/test/test_sysconfig.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py index 38306790e4..a29ca96d1f 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -386,7 +386,9 @@ class TestSysConfig(unittest.TestCase): self.assertIsNotNone(vars['SO']) self.assertEqual(vars['SO'], vars['EXT_SUFFIX']) - @unittest.skipUnless(sys.platform == 'linux', 'Linux-specific test') + @unittest.skipUnless(sys.platform == 'linux' and + hasattr(sys.implementation, '_multiarch'), + 'multiarch-specific test') def test_triplet_in_ext_suffix(self): ctypes = import_module('ctypes') import platform, re @@ -396,8 +398,8 @@ class TestSysConfig(unittest.TestCase): 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'), + self.assertTrue(suffix.endswith('i386-linux-gnu.so') or + suffix.endswith('x86_64-linux-gnux32.so'), suffix) else: # 8 byte pointer size self.assertTrue(suffix.endswith('x86_64-linux-gnu.so'), suffix) |