Keep original ordering of PATH configuration

This commit is contained in:
Yamashita, Yuu 2016-08-02 00:21:28 +00:00
parent 6030ea51e4
commit a456528be8
2 changed files with 6 additions and 5 deletions

View file

@ -25,12 +25,13 @@ load test_helper
}
@test "prefix for system in /" {
mkdir -p "${RBENV_TEST_DIR}/bin"
touch "${RBENV_TEST_DIR}/bin/rbenv-which"
echo "echo /bin/ruby" >"${RBENV_TEST_DIR}/bin/rbenv-which"
chmod +x "${RBENV_TEST_DIR}/bin/rbenv-which"
mkdir -p "${BATS_TEST_DIRNAME}/libexec"
touch "${BATS_TEST_DIRNAME}/libexec/rbenv-which"
echo "echo /bin/ruby" >"${BATS_TEST_DIRNAME}/libexec/rbenv-which"
chmod +x "${BATS_TEST_DIRNAME}/libexec/rbenv-which"
RBENV_VERSION="system" run rbenv-prefix
assert_success "/"
rm -f "${BATS_TEST_DIRNAME}/libexec/rbenv-which"
}
@test "prefix for invalid system" {

View file

@ -20,10 +20,10 @@ if [ -z "$RBENV_TEST_DIR" ]; then
export RBENV_HOOK_PATH="${RBENV_ROOT}/rbenv.d"
PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
PATH="${RBENV_TEST_DIR}/bin:$PATH"
PATH="${BATS_TEST_DIRNAME}/../libexec:$PATH"
PATH="${BATS_TEST_DIRNAME}/libexec:$PATH"
PATH="${RBENV_ROOT}/shims:$PATH"
PATH="${RBENV_TEST_DIR}/bin:$PATH"
export PATH
for xdg_var in `env 2>/dev/null | grep ^XDG_ | cut -d= -f1`; do unset "$xdg_var"; done