Backport the distutils part of r83399 to fix #7645.

diff --git a/Misc/NEWS b/Misc/NEWS
index fc40da565f1706cdd1343836dc639d49dba28da4..315b55694b8f9d38138a6a23fc1998d873d58ee3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,8 @@ Library
 Build
 -----
 
+- Backport r83399 to allow test_distutils to pass on installed versions.
+
 - Issue #1303434: Generate ZIP file containing all PDBs.
 
 Tests

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d9882831fc636d9dbeb5b24b37f7de876c58bdd1..a1f67b84db3d15271beedb6ba0967dfe59d5c3b4 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1020,6 +1020,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=='xmltestdata':