Issue #21097: merge from 3.4

Makefile.pre.in

@@ -1119,26 +1119,26 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 		test/imghdrdata \
 		test/subprocessdata test/sndhdrdata test/support \
 		test/tracedmodules test/encoded_modules \
-		test/namespace_pkgs \
-		test/namespace_pkgs/both_portions \
-		test/namespace_pkgs/both_portions/foo \
-		test/namespace_pkgs/not_a_namespace_pkg \
-		test/namespace_pkgs/not_a_namespace_pkg/foo \
-		test/namespace_pkgs/portion1 \
-		test/namespace_pkgs/portion1/foo \
-		test/namespace_pkgs/portion2 \
-		test/namespace_pkgs/portion2/foo \
-		test/namespace_pkgs/project1 \
-		test/namespace_pkgs/project1/parent \
-		test/namespace_pkgs/project1/parent/child \
-		test/namespace_pkgs/project2 \
-		test/namespace_pkgs/project2/parent \
-		test/namespace_pkgs/project2/parent/child \
-		test/namespace_pkgs/project3 \
-		test/namespace_pkgs/project3/parent \
-		test/namespace_pkgs/project3/parent/child \
-                test/namespace_pkgs/module_and_namespace_package \
-                test/namespace_pkgs/module_and_namespace_package/a_test \
+		test/test_importlib/namespace_pkgs \
+		test/test_importlib/namespace_pkgs/both_portions \
+		test/test_importlib/namespace_pkgs/both_portions/foo \
+		test/test_importlib/namespace_pkgs/not_a_namespace_pkg \
+		test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo \
+		test/test_importlib/namespace_pkgs/portion1 \
+		test/test_importlib/namespace_pkgs/portion1/foo \
+		test/test_importlib/namespace_pkgs/portion2 \
+		test/test_importlib/namespace_pkgs/portion2/foo \
+		test/test_importlib/namespace_pkgs/project1 \
+		test/test_importlib/namespace_pkgs/project1/parent \
+		test/test_importlib/namespace_pkgs/project1/parent/child \
+		test/test_importlib/namespace_pkgs/project2 \
+		test/test_importlib/namespace_pkgs/project2/parent \
+		test/test_importlib/namespace_pkgs/project2/parent/child \
+		test/test_importlib/namespace_pkgs/project3 \
+		test/test_importlib/namespace_pkgs/project3/parent \
+		test/test_importlib/namespace_pkgs/project3/parent/child \
+                test/test_importlib/namespace_pkgs/module_and_namespace_package \
+                test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
 		asyncio \
 		test/test_asyncio \
 		collections concurrent concurrent/futures encodings \