Visitar URL original
GH-89858: fix test_embed for Out-of-tree builds by kumaraditya303 · Pull Request #93465 · python/cpython · GitHub
Skip to content

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

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.

Sign up for GitHub

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

Merged
zooba merged 12 commits into from
Jun 17, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
07e8fc3
fix OOT
kumaraditya303 Jun 3, 2022
99fb874
fix test
kumaraditya303 Jun 3, 2022
0cdf8fd
reduce diff
kumaraditya303 Jun 3, 2022
09b8b9a
non OOT
kumaraditya303 Jun 3, 2022
912fed3
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 3, 2022
390e929
fix windows
kumaraditya303 Jun 8, 2022
786524d
Merge branch 'main' of https://github.com/python/cpython into test_embed
kumaraditya303 Jun 10, 2022
72fdd2d
remove windows
kumaraditya303 Jun 10, 2022
5c2e3e8
fix it
kumaraditya303 Jun 10, 2022
61f1141
Merge branch 'main' of https://github.com/python/cpython into test_embed
kumaraditya303 Jun 15, 2022
f414f71
Merge branch 'main' into test_embed
kumaraditya303 Jun 17, 2022
ac481bf
rebase
kumaraditya303 Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Lib/test/test_embed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,16 @@ def setUp(self):
ext = ("_d" if debug_build(sys.executable) else "") + ".exe"
exename += ext
exepath = builddir
expecteddir = os.path.join(support.REPO_ROOT, builddir)
else:
exepath = os.path.join(builddir, 'Programs')
expecteddir = os.path.join(support.REPO_ROOT, 'Programs')
self.test_exe = exe = os.path.join(exepath, exename)
if exepath != expecteddir or not os.path.exists(exe):
if 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)
os.chdir(builddir)
Comment thread
kumaraditya303 marked this conversation as resolved.
Outdated

def tearDown(self):
os.chdir(self.oldcwd)
Expand Down Expand Up @@ -1375,10 +1373,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'))
Comment thread
kumaraditya303 marked this conversation as resolved.
Outdated
os.mkdir(libdir)

filename = os.path.join(tmpdir, 'pybuilddir.txt')
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tests/2022-06-03-12-22-44.gh-issue-89858.ftBvjE.rst
View file
Open in desktop
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.