test, etc.

python · zooba · Jun 16, 2022 · Jun 9, 2022 · Jun 11, 2022 · Jun 11, 2022
commit 0be59f2ab5cefc81e50aee4104d3bb9ccdd0aad4
diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py
@@ -239,6 +239,43 @@ def test_buildtree_pythonhome_win32(self):
         actual = getpath(ns, expected)
         self.assertEqual(expected, actual)
 
+    def test_run_in_tree_build_win32(self):
+        "Test _is_python_build fields with edge cases.(gh-91985)"
+        def read_pathconfig(config, attr):
+            if _Py_path_config[attr] >= 0 and config[attr] <= 0:
+                config[attr] = _Py_path_config[attr]
+
+        def update_pathconfig(config, attr):
+            if config[attr] > 0:
+                _Py_path_config[attr] = config[attr]
+
+        edges = {
+            ( 0, -1) :  0,
+            (-1,  0) : -1,
+            (-1, -1) : -1,
+            ( 1,  0) :  1,
+        }
+        for key in edges:
+            _Py_path_config = dict(
+                _is_python_build=key[0],
+            )
+            ns = MockNTNamespace(
+                argv0=r"C:\CPython\PCbuild\amd64\python.exe",
+            )
+            ns['config'].update(
+                _is_python_build=key[1],
+            )
+            # _PyConfig_InitPathConfig emulation
+            read_pathconfig(ns['config'], '_is_python_build')
+            expected = dict(
+                _is_python_build=ns['config']['_is_python_build'],
+                build_prefix=None,  # no build-landmark
+            )
+            actual = getpath(ns, expected)
+            self.assertEqual(actual, expected)
+            update_pathconfig(actual, '_is_python_build')
+            self.assertEqual(_Py_path_config['_is_python_build'], edges[key])
+
     def test_normal_posix(self):
         "Test a 'standard' install layout on *nix"
         ns = MockPosixNamespace(

@@ -462,7 +462,7 @@ def search_up(prefix, *landmarks, test=isfile):
 build_prefix = None
 
 if ((not home_was_set and real_executable_dir and not py_setpath)
-        or config.get('_is_python_build')):
+        or config.get('_is_python_build', 0) > 0):
     # Detect a build marker and use it to infer prefix, exec_prefix,
     # stdlib_dir and the platstdlib_dir directories.
     try:

@@ -103,7 +103,7 @@ _PyPathConfig_ReadGlobal(PyConfig *config)
 
 #define COPY_INT(ATTR) \
     do { \
-        if ((_Py_path_config.ATTR > 0) && (config->ATTR <= 0)) { \
+        if ((_Py_path_config.ATTR >= 0) && (config->ATTR <= 0)) { \
             config->ATTR = _Py_path_config.ATTR; \
         } \
     } while (0)