1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-45506: Fix test_embed expecting to not find stdlib in source tree build when stdlib has been installed. (GH-29649)

Browse Source
This commit is contained in:
Steve Dower 2021-11-20 00:11:40 +00:00 committed by GitHub
parent 546cefcda7
commit 4c616911b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/test/test_embed.py
View File

@ -35,6 +35,13 @@ INIT_LOOPS = 16
MAX_HASH_SEED = 4294967295 MAX_HASH_SEED = 4294967295
# If we are running from a build dir, but the stdlib has been installed,
# some tests need to expect different results.
STDLIB_INSTALL = os.path.join(sys.prefix, sys.platlibdir,
f'python{sys.version_info.major}.{sys.version_info.minor}')
if not os.path.isfile(os.path.join(STDLIB_INSTALL, 'os.py')):
STDLIB_INSTALL = None
def debug_build(program): def debug_build(program):
program = os.path.basename(program) program = os.path.basename(program)
name = os.path.splitext(program)[0] name = os.path.splitext(program)[0]
@ -1307,10 +1314,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
'base_executable': executable, 'base_executable': executable,
'executable': executable, 'executable': executable,
'module_search_paths': module_search_paths, 'module_search_paths': module_search_paths,
# The current getpath.c doesn't determine the stdlib dir 'stdlib_dir': STDLIB_INSTALL,
# in this case. 'use_frozen_modules': 1 if STDLIB_INSTALL else -1,
'stdlib_dir': None,
'use_frozen_modules': -1,
} }
env = self.copy_paths_by_env(config) env = self.copy_paths_by_env(config)
self.check_all_configs("test_init_compat_config", config, self.check_all_configs("test_init_compat_config", config,
@ -1381,8 +1386,8 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
else: else:
# The current getpath.c doesn't determine the stdlib dir # The current getpath.c doesn't determine the stdlib dir
# in this case. # in this case.
config['stdlib_dir'] = None config['stdlib_dir'] = STDLIB_INSTALL
config['use_frozen_modules'] = -1 config['use_frozen_modules'] = 1 if STDLIB_INSTALL else -1
env = self.copy_paths_by_env(config) env = self.copy_paths_by_env(config)
self.check_all_configs("test_init_compat_config", config, self.check_all_configs("test_init_compat_config", config,