From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 27 Jul 2017 09:24:36 +0000 (+0300)
Subject: bpo-30814, bpo-30876: Add new import test files to projects. (#2851)
X-Git-Tag: v3.7.0a1~355
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5ed47dea25e04a3a144eddf99a4ac4a29242dbc;p=thirdparty%2FPython%2Fcpython.git

bpo-30814, bpo-30876: Add new import test files to projects. (#2851)
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5602c165463a..989349165780 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1204,6 +1204,8 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 		test/test_import/data \
 		test/test_import/data/circular_imports \
 		test/test_import/data/circular_imports/subpkg \
+		test/test_import/data/package \
+		test/test_import/data/package2 \
 		test/test_importlib/namespace_pkgs \
 		test/test_importlib/namespace_pkgs/both_portions \
 		test/test_importlib/namespace_pkgs/both_portions/foo \
diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj
index 73927b33f72b..273d5ef7529e 100644
--- a/PCbuild/lib.pyproj
+++ b/PCbuild/lib.pyproj
@@ -1127,6 +1127,10 @@
     <Compile Include="test\test_import\data\circular_imports\subpkg\subpackage2.py" />
     <Compile Include="test\test_import\data\circular_imports\subpkg\util.py" />
     <Compile Include="test\test_import\data\circular_imports\util.py" />
+    <Compile Include="test\test_import\data\package\__init__.py" />
+    <Compile Include="test\test_import\data\package\submodule.py" />
+    <Compile Include="test\test_import\data\package2\submodule1.py" />
+    <Compile Include="test\test_import\data\package2\submodule2.py" />
     <Compile Include="test\test_import\__init__.py" />
     <Compile Include="test\test_import\__main__.py" />
     <Compile Include="test\test_index.py" />
@@ -1786,6 +1790,8 @@
     <Folder Include="test\test_import\data\" />
     <Folder Include="test\test_import\data\circular_imports" />
     <Folder Include="test\test_import\data\circular_imports\subpkg" />
+    <Folder Include="test\test_import\data\package" />
+    <Folder Include="test\test_import\data\package2" />
     <Folder Include="test\test_json" />
     <Folder Include="test\test_tools" />
     <Folder Include="test\test_warnings" />