Merge pull request #979 from jasonkarns/test-setup-cleanup

Remove suite-wide setup
This commit is contained in:
Mislav Marohnić 2016-08-15 09:34:06 +02:00 committed by GitHub
commit f085feb8ec
6 changed files with 10 additions and 8 deletions

View file

@ -1222,9 +1222,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

View file

@ -5,6 +5,10 @@ export RUBY_BUILD_SKIP_MIRROR=1
export RUBY_BUILD_CACHE_PATH=
export RUBY_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"

View file

@ -3,7 +3,6 @@
load test_helper
setup() {
ensure_not_found_in_path aria2c
export RBENV_ROOT="${TMP}/rbenv"
export HOOK_PATH="${TMP}/i has hooks"
mkdir -p "$HOOK_PATH"

View file

@ -6,6 +6,10 @@ export RUBY_BUILD_CACHE_PATH=
export RUBY_BUILD_MIRROR_URL=http://mirror.example.com
export RUBY_BUILD_CURL_OPTS=
setup() {
ensure_not_found_in_path aria2c
}
@test "package URL without checksum bypasses mirror" {
stub shasum true

View file

@ -4,7 +4,6 @@ load test_helper
export RBENV_ROOT="${TMP}/rbenv"
setup() {
ensure_not_found_in_path aria2c
stub rbenv-hooks 'install : true'
stub rbenv-rehash 'true'
}

View file

@ -38,10 +38,6 @@ ensure_not_found_in_path() {
done
}
setup() {
ensure_not_found_in_path aria2c
}
teardown() {
rm -fr "${TMP:?}"/*
}