mirror of
https://github.com/rbenv/ruby-build.git
synced 2025-10-30 08:41:08 +01:00
Merge pull request #979 from jasonkarns/test-setup-cleanup
Remove suite-wide setup
This commit is contained in:
commit
f085feb8ec
6 changed files with 10 additions and 8 deletions
|
|
@ -1222,9 +1222,9 @@ if [ -z "$MAKE" ]; then
|
||||||
export MAKE="gmake"
|
export MAKE="gmake"
|
||||||
else
|
else
|
||||||
if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
|
if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
|
||||||
export MAKE="gmake"
|
export MAKE="gmake"
|
||||||
else
|
else
|
||||||
export MAKE="make"
|
export MAKE="make"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,10 @@ export RUBY_BUILD_SKIP_MIRROR=1
|
||||||
export RUBY_BUILD_CACHE_PATH=
|
export RUBY_BUILD_CACHE_PATH=
|
||||||
export RUBY_BUILD_CURL_OPTS=
|
export RUBY_BUILD_CURL_OPTS=
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
ensure_not_found_in_path aria2c
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@test "package URL without checksum" {
|
@test "package URL without checksum" {
|
||||||
stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"
|
stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
load test_helper
|
load test_helper
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
ensure_not_found_in_path aria2c
|
|
||||||
export RBENV_ROOT="${TMP}/rbenv"
|
export RBENV_ROOT="${TMP}/rbenv"
|
||||||
export HOOK_PATH="${TMP}/i has hooks"
|
export HOOK_PATH="${TMP}/i has hooks"
|
||||||
mkdir -p "$HOOK_PATH"
|
mkdir -p "$HOOK_PATH"
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,10 @@ export RUBY_BUILD_CACHE_PATH=
|
||||||
export RUBY_BUILD_MIRROR_URL=http://mirror.example.com
|
export RUBY_BUILD_MIRROR_URL=http://mirror.example.com
|
||||||
export RUBY_BUILD_CURL_OPTS=
|
export RUBY_BUILD_CURL_OPTS=
|
||||||
|
|
||||||
|
setup() {
|
||||||
|
ensure_not_found_in_path aria2c
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@test "package URL without checksum bypasses mirror" {
|
@test "package URL without checksum bypasses mirror" {
|
||||||
stub shasum true
|
stub shasum true
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ load test_helper
|
||||||
export RBENV_ROOT="${TMP}/rbenv"
|
export RBENV_ROOT="${TMP}/rbenv"
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
ensure_not_found_in_path aria2c
|
|
||||||
stub rbenv-hooks 'install : true'
|
stub rbenv-hooks 'install : true'
|
||||||
stub rbenv-rehash 'true'
|
stub rbenv-rehash 'true'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,10 +38,6 @@ ensure_not_found_in_path() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
setup() {
|
|
||||||
ensure_not_found_in_path aria2c
|
|
||||||
}
|
|
||||||
|
|
||||||
teardown() {
|
teardown() {
|
||||||
rm -fr "${TMP:?}"/*
|
rm -fr "${TMP:?}"/*
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue