This is an archive of the discontinued LLVM Phabricator instance.

Differential D106941

test-release.sh: Kill python2
ClosedPublic

Authored by rovka on Jul 28 2021, 3:18 AM.

Details

Reviewers
tstellar
Commits
rG9ff030ca50e3: test-release.sh: Kill python2
Summary

Don't prefer python2's virtualenv when setting up the test-suite.
Always use python3 instead, since that's what we require everywhere else
anyway.

Diff Detail

Event Timeline

rovka requested review of this revision.Jul 28 2021, 3:18 AM
rovka created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJul 28 2021, 3:18 AM
Harbormaster completed remote builds in B116642: Diff 362314.Jul 28 2021, 4:00 AM
tstellar accepted this revision.Jul 28 2021, 6:59 AM

LGTM. Can you also backport this to the release/13.x branch?

This revision is now accepted and ready to land.Jul 28 2021, 6:59 AM
Closed by commit rG9ff030ca50e3: test-release.sh: Kill python2 (authored by rovka). · Explain WhyJul 29 2021, 1:26 AM
This revision was automatically updated to reflect the committed changes.
rovka added a commit: rG9ff030ca50e3: test-release.sh: Kill python2.
rovka added a comment.Jul 29 2021, 1:32 AM

Sure, done :)

Revision Contents

PathSize
llvm/
utils/
release/
7 lines

Diff 362668

llvm/utils/release/test-release.sh

Show First 20 Lines • Show All 502 Lines • ▼ Show 20 Lines
if [ "$do_checkout" = "yes" ]; then if [ "$do_checkout" = "yes" ]; then
export_sources export_sources
fi fi
# Setup the test-suite. Do this early so we can catch failures before # Setup the test-suite. Do this early so we can catch failures before
# we do the full 3 stage build. # we do the full 3 stage build.
if [ $do_test_suite = "yes" ]; then if [ $do_test_suite = "yes" ]; then
venv=virtualenv
if ! type -P 'virtualenv' > /dev/null 2>&1 ; then
check_program_exists 'python3' check_program_exists 'python3'
venv="python3 -m venv" venv="python3 -m venv"
fi
SandboxDir="$BuildDir/sandbox" SandboxDir="$BuildDir/sandbox"
Lit=$SandboxDir/bin/lit Lit=$SandboxDir/bin/lit
TestSuiteBuildDir="$BuildDir/test-suite-build" TestSuiteBuildDir="$BuildDir/test-suite-build"
TestSuiteSrcDir="$BuildDir/llvm-test-suite" TestSuiteSrcDir="$BuildDir/llvm-test-suite"
${venv} $SandboxDir ${venv} $SandboxDir
$SandboxDir/bin/python $BuildDir/llvm-project/llvm/utils/lit/setup.py install $SandboxDir/bin/python $BuildDir/llvm-project/llvm/utils/lit/setup.py install
▲ Show 20 Lines • Show All 132 Lines • Show Last 20 Lines