Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-89858: fix test_embed for Out-of-tree builds #93465

Merged
merged 12 commits into from
Jun 17, 2022
10 changes: 7 additions & 3 deletions Lib/test/test_embed.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,18 @@ def setUp(self):
expecteddir = os.path.join(support.REPO_ROOT, builddir)
else:
exepath = os.path.join(builddir, 'Programs')
expecteddir = os.path.join(support.REPO_ROOT, 'Programs')
expecteddir = os.path.join(builddir, 'Programs')
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
self.test_exe = exe = os.path.join(exepath, exename)
if exepath != expecteddir or not os.path.exists(exe):
self.skipTest("%r doesn't exist" % exe)
# This is needed otherwise we get a fatal error:
# "Py_Initialize: Unable to get the locale encoding
# LookupError: no codec search functions registered: can't find encoding"
self.oldcwd = os.getcwd()
os.chdir(support.REPO_ROOT)
if MS_WINDOWS:
os.chdir(support.REPO_ROOT)
else:
os.chdir(builddir)
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved

def tearDown(self):
os.chdir(self.oldcwd)
Expand Down Expand Up @@ -1318,10 +1321,11 @@ def test_init_pybuilddir(self):
with self.tmpdir_with_python() as tmpdir:
# pybuilddir.txt is a sub-directory relative to the current
# directory (tmpdir)
vpath = sysconfig.get_config_var("VPATH") or ''
subdir = 'libdir'
libdir = os.path.join(tmpdir, subdir)
# The stdlib dir is dirname(executable) + VPATH + 'Lib'
stdlibdir = os.path.join(tmpdir, 'Lib')
stdlibdir = os.path.normpath(os.path.join(tmpdir, vpath, 'Lib'))
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
os.mkdir(libdir)

filename = os.path.join(tmpdir, 'pybuilddir.txt')
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix ``test_embed`` for out-of-tree builds. Patch by Kumar Aditya.