From: Xavier de Gaye <xdegaye@users.sourceforge.net>
Date: Wed, 14 Dec 2016 19:37:53 +0000 (+0100)
Subject: Issue #28849: Merge 3.6.
X-Git-Tag: v3.7.0a1~1754
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e660327cf10c51fc0e79e2c15224817c600cbded;p=thirdparty%2FPython%2Fcpython.git

Issue #28849: Merge 3.6.
---

e660327cf10c51fc0e79e2c15224817c600cbded
diff --cc Lib/test/test_sysconfig.py
index a3baea86fe59,355bc614da35..694435f56c34
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@@ -385,11 -385,11 +385,12 @@@ class TestSysConfig(unittest.TestCase)
          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):
 -        import ctypes, platform, re
 +        ctypes = import_module('ctypes')
 +        import platform, re
          machine = platform.machine()
          suffix = sysconfig.get_config_var('EXT_SUFFIX')
          if re.match('(aarch64|arm|mips|ppc|powerpc|s390|sparc)', machine):