From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 14 Jan 2017 06:26:51 +0000 (+0000)
Subject: Merge tests from 3.5
X-Git-Tag: v3.6.1rc1~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=758c7d044bb98da9e98654fa91961f54a915712d;p=thirdparty%2FPython%2Fcpython.git

Merge tests from 3.5
---

758c7d044bb98da9e98654fa91961f54a915712d
diff --cc Lib/test/test_sysconfig.py
index 355bc614da35,38306790e42f..a29ca96d1fc4
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@@ -385,11 -386,10 +386,12 @@@ 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):
-         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):