summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-07-27 09:24:36 (GMT)
committerGitHub <noreply@github.com>2017-07-27 09:24:36 (GMT)
commitd5ed47dea25e04a3a144eddf99a4ac4a29242dbc (patch)
tree5ed7aa5b602a17797ceb5ea710c94fb7fe064df5
parentfd46561167af6cd697191dd7ebb8c2fef5ad6493 (diff)
downloadcpython-d5ed47dea25e04a3a144eddf99a4ac4a29242dbc.zip
cpython-d5ed47dea25e04a3a144eddf99a4ac4a29242dbc.tar.gz
cpython-d5ed47dea25e04a3a144eddf99a4ac4a29242dbc.tar.bz2
bpo-30814, bpo-30876: Add new import test files to projects. (#2851)
-rw-r--r--Makefile.pre.in2
-rw-r--r--PCbuild/lib.pyproj6
2 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5602c16..9893491 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 73927b3..273d5ef 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" />