test_packaging and test_distutils failures under Windows

Lib/distutils/tests/test_install.py

 """Tests for distutils.command.install."""
 
 import os
 import sys
 import unittest
 import site
 
 from test.support import captured_stdout, run_unittest
 
 from distutils import sysconfig
 from distutils.command.install import install
 from distutils.command import install as install_module
 from distutils.command.build_ext import build_ext
 from distutils.command.install import INSTALL_SCHEMES
 from distutils.core import Distribution
 from distutils.errors import DistutilsOptionError
 from distutils.extension import Extension
 
 from distutils.tests import support
 
 
 def _make_ext_name(modname):
     if os.name == 'nt':
-        modname += '_d'
+        if sys.executable.endswith('_d.exe'):
+            modname += '_d'
     return modname + sysconfig.get_config_var('SO')
 
 
 class InstallTestCase(support.TempdirManager,
                       support.EnvironGuard,
                       support.LoggingSilencer,
                       unittest.TestCase):
 
     def test_home_installation_scheme(self):
         # This ensure two things:
@@ skipping 166 matching lines @@
         self.assertEqual(found, expected)
 
     def test_record_extensions(self):
         install_dir = self.mkdtemp()
         project_dir, dist = self.create_dist(ext_modules=[
             Extension('xx', ['xxmodule.c'])])
         self.addCleanup(os.chdir, os.getcwd())
         os.chdir(project_dir)
         support.copy_xxmodule_c(project_dir)
 
-        buildcmd = build_ext(dist)
-        support.fixup_build_ext(buildcmd)
-        buildcmd.ensure_finalized()
-        buildcmd.run()
+        buildextcmd = build_ext(dist)
+        support.fixup_build_ext(buildextcmd)
+        buildextcmd.ensure_finalized()
 
         cmd = install(dist)
         dist.command_obj['install'] = cmd
+        dist.command_obj['build_ext'] = buildextcmd
         cmd.root = install_dir
         cmd.record = os.path.join(project_dir, 'RECORD')
         cmd.ensure_finalized()
         cmd.run()
 
         f = open(cmd.record)
         try:
             content = f.read()
         finally:
             f.close()
@@ skipping 12 matching lines @@
                 self.test_record()
         finally:
             install_module.DEBUG = False
         self.assertTrue(len(self.logs) > old_logs_len)
 
 def test_suite():
     return unittest.makeSuite(InstallTestCase)
 
 if __name__ == "__main__":
     run_unittest(test_suite())