Skip to content

gh-103053: Run tools test_freeze on buildbot (second attempt) #110447

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

Closed
wants to merge 1 commit into from
Closed

gh-103053: Run tools test_freeze on buildbot (second attempt) #110447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Lib/test/test_tools/test_freeze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

@support.requires_zlib()
@unittest.skipIf(sys.platform.startswith('win'), 'not supported on Windows')
@support.skip_if_buildbot('not all buildbots have enough space')
# gh-103053: Skip test if Python is built with Profile Guided Optimization
# (PGO), since the test is just too slow in this case.
@unittest.skipIf(support.check_cflags_pgo(),
Expand Down
30 changes: 18 additions & 12 deletions Tools/freeze/test/freeze.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ class UnsupportedError(Exception):
"""The operation isn't supported."""


def _run_quiet(cmd, cwd=None):
#print(f'# {" ".join(shlex.quote(a) for a in cmd)}')
def _run_quiet(cmd, *, cwd=None):
if cwd:
print('+', 'cd', cwd, flush=True)
print('+', shlex.join(cmd), flush=True)
try:
return subprocess.run(
cmd,
Expand All @@ -48,8 +50,8 @@ def _run_quiet(cmd, cwd=None):
raise


def _run_stdout(cmd, cwd=None):
proc = _run_quiet(cmd, cwd)
def _run_stdout(cmd):
proc = _run_quiet(cmd)
return proc.stdout.strip()


Expand Down Expand Up @@ -91,13 +93,16 @@ def copy_source_tree(newroot, oldroot):

shutil.copytree(oldroot, newroot, ignore=support.copy_python_src_ignore)
if os.path.exists(os.path.join(newroot, 'Makefile')):
_run_quiet([MAKE, 'clean'], newroot)
_run_quiet([MAKE, 'clean'], cwd=newroot)


##################################
# freezing

def prepare(script=None, outdir=None):
print()
print("cwd:", os.getcwd())

if not outdir:
outdir = OUTDIR
os.makedirs(outdir, exist_ok=True)
Expand Down Expand Up @@ -125,7 +130,7 @@ def prepare(script=None, outdir=None):
ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache'))
prefix = os.path.join(outdir, 'python-installation')
ensure_opt(cmd, 'prefix', prefix)
_run_quiet(cmd, builddir)
_run_quiet(cmd, cwd=builddir)

if not MAKE:
raise UnsupportedError('make')
Expand All @@ -135,20 +140,21 @@ def prepare(script=None, outdir=None):
# this test is most often run as part of the whole suite with a lot
# of other tests running in parallel, from 1-2 vCPU systems up to
# people's NNN core beasts. Don't attempt to use it all.
parallel = f'-j{cores*2//3}'
jobs = cores * 2 // 3
parallel = f'-j{jobs}'
else:
parallel = '-j2'

# Build python.
print(f'building python {parallel=} in {builddir}...')
if os.path.exists(os.path.join(srcdir, 'Makefile')):
# Out-of-tree builds require a clean srcdir.
_run_quiet([MAKE, '-C', srcdir, 'clean'])
_run_quiet([MAKE, '-C', builddir, parallel])
_run_quiet([MAKE, 'clean'], cwd=srcdir)
_run_quiet([MAKE, parallel], cwd=builddir)

# Install the build.
print(f'installing python into {prefix}...')
_run_quiet([MAKE, '-C', builddir, 'install'])
_run_quiet([MAKE, 'install'], cwd=builddir)
python = os.path.join(prefix, 'bin', 'python3')

return outdir, scriptfile, python
Expand All @@ -161,8 +167,8 @@ def freeze(python, scriptfile, outdir):
print(f'freezing {scriptfile}...')
os.makedirs(outdir, exist_ok=True)
# Use -E to ignore PYTHONSAFEPATH
_run_quiet([python, '-E', FREEZE, '-o', outdir, scriptfile], outdir)
_run_quiet([MAKE, '-C', os.path.dirname(scriptfile)])
_run_quiet([python, '-E', FREEZE, '-o', outdir, scriptfile], cwd=outdir)
_run_quiet([MAKE], cwd=os.path.dirname(scriptfile))

name = os.path.basename(scriptfile).rpartition('.')[0]
executable = os.path.join(outdir, name)
Expand Down