Backport the distutils part of r83399 to fix #7645.

diff --git a/Misc/NEWS b/Misc/NEWS
index 8f958147441d6953877e7ff94b6286991ed97c13..53b18d60e12be4de935e04fd0016d32da91971d6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Library
 Build
 -----
 
+- Backport r83399 to allow test_distutils to pass on installed versions.
+
 - Issue #1303434: Generate ZIP file containing all PDBs (already done for rc1).
 
 - Stop packaging versioncheck tool (already done for rc1).

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index ae3b01892cc27f996499a09c74aee70675805339..1a87a4081645c9f14864f516547c3c166fa74195 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1019,6 +1019,8 @@ def add_files(db):
             lib.glob("*.pem")
             lib.glob("*.pck")
             lib.add_file("zipdir.zip")
+        if dir=='tests' and parent.physical=='distutils':
+            lib.add_file("Setup.sample")
         if dir=='decimaltestdata':
             lib.glob("*.decTest")
         if dir=='output':