[Python-checkins] cpython (merge 3.6 -> default): Issue #28849: Merge 3.6.

[xavier.degaye]

https://hg.python.org/cpython/rev/0ff181ca7558
changeset:   105627:0ff181ca7558
parent:      105625:5a61c1bc3df9
parent:      105626:ab3d870aa3bc
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Wed Dec 14 20:37:53 2016 +0100
summary:
  Issue #28849: Merge 3.6.

files:
  Lib/test/test_sysconfig.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -385,7 +385,8 @@
         self.assertIsNotNone(vars['SO'])
         self.assertEqual(vars['SO'], vars['EXT_SUFFIX'])
 
-    @unittest.skipUnless(hasattr(sys.implementation, '_multiarch'),
+    @unittest.skipUnless(sys.platform == 'linux' and
+                         hasattr(sys.implementation, '_multiarch'),
                          'multiarch-specific test')
     def test_triplet_in_ext_suffix(self):
         ctypes = import_module('ctypes')

-- 
Repository URL: https://hg.python.org/cpython