Skip to content

gh-103186: In test_tools.freeze, fetch CONFIG_ARGS from original source directory #103213

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
erlend-aasland merged 9 commits into from
Jul 11, 2023
Merged

gh-103186: In test_tools.freeze, fetch CONFIG_ARGS from original source directory #103213

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d3217d1
Fetch CONFIG_ARGS from original python instance
TabLand Apr 3, 2023
e79d1e2
Sometimes the Makefile is missing
TabLand Apr 4, 2023
56345e4
Add a news entry
arhadthedev Apr 5, 2023
4f3060a
Improve naming conventions
TabLand May 10, 2023
3d4ade3
Merge branch 'main' into fix-issue-103186-test_tools.freeze
TabLand May 10, 2023
e423ff8
Merge branch 'main' into fix-issue-103186-test_tools.freeze
TabLand Jul 8, 2023
382947b
Revert "Improve naming conventions"
erlend-aasland Jul 11, 2023
743c0ef
Pull in main
erlend-aasland Jul 11, 2023
4b72a71
Revert whitespace change
erlend-aasland Jul 11, 2023
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
Next Next commit
Fetch CONFIG_ARGS from original python instance 
instead of fetching from intermediate instance. As "make clean" is called
against the intermediate instance, the build directory is cleared and the
config arguments lookup fails with a ModuleNotFoundError
  • Loading branch information
@TabLand
TabLand committed Apr 3, 2023
commit d3217d12eee9eefad8444e80545b82b2a8c2be4c
4 changes: 3 additions & 1 deletion Tools/freeze/test/freeze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ def ignore_non_src(src, names):
shutil.copytree(oldroot, newroot, ignore=ignore_non_src)
if os.path.exists(os.path.join(newroot, 'Makefile')):
_run_quiet([MAKE, 'clean'], newroot)
else:
raise Exception("new frozen build Makefile missing!")


def get_makefile_var(builddir, name):
Expand Down Expand Up @@ -153,7 +155,7 @@ def prepare(script=None, outdir=None):
print(f'configuring python in {builddir}...')
cmd = [
os.path.join(srcdir, 'configure'),
*shlex.split(get_config_var(srcdir, 'CONFIG_ARGS') or ''),
*shlex.split(get_config_var(SRCDIR, 'CONFIG_ARGS') or ''),
]
ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache'))
prefix = os.path.join(outdir, 'python-installation')
Expand Down