[llvm] cf55866 - [test-release] fallback to py3's venv module
Brian Cain via llvm-commits
llvm-commits at lists.llvm.org
Tue Jul 21 17:51:48 PDT 2020
Author: Brian Cain
Date: 2020-07-21T19:51:15-05:00
New Revision: cf558661852e2e5b5e3b4e71510acb3f65fc6390
URL: https://github.com/llvm/llvm-project/commit/cf558661852e2e5b5e3b4e71510acb3f65fc6390
DIFF: https://github.com/llvm/llvm-project/commit/cf558661852e2e5b5e3b4e71510acb3f65fc6390.diff
LOG: [test-release] fallback to py3's venv module
If virtualenv is not available, we can look for py3's venv instead. We only
use this particular env for installing and running the test suite.
Added:
Modified:
llvm/utils/release/test-release.sh
Removed:
################################################################################
diff --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh
index 5351ae1064f9..6bb6f42b0805 100755
--- a/llvm/utils/release/test-release.sh
+++ b/llvm/utils/release/test-release.sh
@@ -502,12 +502,18 @@ fi
# Setup the test-suite. Do this early so we can catch failures before
# we do the full 3 stage build.
if [ $do_test_suite = "yes" ]; then
+ venv=virtualenv
+ if ! type -P 'virtualenv' > /dev/null 2>&1 ; then
+ check_program_exists 'python3'
+ venv="python3 -m venv"
+ fi
+
SandboxDir="$BuildDir/sandbox"
Lit=$SandboxDir/bin/lit
TestSuiteBuildDir="$BuildDir/test-suite-build"
TestSuiteSrcDir="$BuildDir/llvm-test-suite"
- virtualenv $SandboxDir
+ ${venv} $SandboxDir
$SandboxDir/bin/python $BuildDir/llvm-project/llvm/utils/lit/setup.py install
mkdir -p $TestSuiteBuildDir
fi
More information about the llvm-commits
mailing list