mirror of
https://github.com/pyenv/pyenv.git
synced 2024-11-14 20:39:55 -05:00
Import changes in rbenv/ruby-build#979
This commit is contained in:
parent
3a1379cb34
commit
66c8ca6cff
6 changed files with 10 additions and 8 deletions
|
@ -1836,9 +1836,9 @@ if [ -z "$MAKE" ]; then
|
|||
# export MAKE="gmake"
|
||||
# else
|
||||
if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
|
||||
export MAKE="gmake"
|
||||
export MAKE="gmake"
|
||||
else
|
||||
export MAKE="make"
|
||||
export MAKE="make"
|
||||
fi
|
||||
# fi
|
||||
else
|
||||
|
|
|
@ -5,6 +5,10 @@ export PYTHON_BUILD_SKIP_MIRROR=1
|
|||
export PYTHON_BUILD_CACHE_PATH=
|
||||
export PYTHON_BUILD_CURL_OPTS=
|
||||
|
||||
setup() {
|
||||
ensure_not_found_in_path aria2c
|
||||
}
|
||||
|
||||
|
||||
@test "package URL without checksum" {
|
||||
stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
load test_helper
|
||||
|
||||
setup() {
|
||||
ensure_not_found_in_path aria2c
|
||||
export PYENV_ROOT="${TMP}/pyenv"
|
||||
export HOOK_PATH="${TMP}/i has hooks"
|
||||
mkdir -p "$HOOK_PATH"
|
||||
|
|
|
@ -6,6 +6,10 @@ export PYTHON_BUILD_CACHE_PATH=
|
|||
export PYTHON_BUILD_MIRROR_URL=http://mirror.example.com
|
||||
export PYTHON_BUILD_CURL_OPTS=
|
||||
|
||||
setup() {
|
||||
ensure_not_found_in_path aria2c
|
||||
}
|
||||
|
||||
|
||||
@test "package URL without checksum bypasses mirror" {
|
||||
stub shasum true
|
||||
|
|
|
@ -4,7 +4,6 @@ load test_helper
|
|||
export PYENV_ROOT="${TMP}/pyenv"
|
||||
|
||||
setup() {
|
||||
ensure_not_found_in_path aria2c
|
||||
stub pyenv-hooks 'install : true'
|
||||
stub pyenv-rehash 'true'
|
||||
}
|
||||
|
|
|
@ -38,10 +38,6 @@ ensure_not_found_in_path() {
|
|||
done
|
||||
}
|
||||
|
||||
setup() {
|
||||
ensure_not_found_in_path aria2c
|
||||
}
|
||||
|
||||
teardown() {
|
||||
rm -fr "${TMP:?}"/*
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue