From 3dc0005032f04d40001cf0542d2b3d154dc2dc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Thu, 2 Jan 2014 22:17:38 +0100 Subject: [PATCH] Fix test suite running on OpenBSD The error was "bash: no such file or directory" and it was due to bash being located in `/usr/local/bin` on OpenBSD 5.4 instead of `/bin` like on other systems. Fixed by keeping `/usr/local/bin` in PATH during the test run. --- test/init.bats | 4 ++-- test/test_helper.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/init.bats b/test/init.bats index 61b30be7..60a3328c 100644 --- a/test/init.bats +++ b/test/init.bats @@ -51,14 +51,14 @@ load test_helper } @test "adds shims to PATH" { - export PATH="${BATS_TEST_DIRNAME}/../libexec:/usr/bin:/bin" + export PATH="${BATS_TEST_DIRNAME}/../libexec:/usr/bin:/bin:/usr/local/bin" run rbenv-init - bash assert_success assert_line 0 'export PATH="'${RBENV_ROOT}'/shims:${PATH}"' } @test "adds shims to PATH (fish)" { - export PATH="${BATS_TEST_DIRNAME}/../libexec:/usr/bin:/bin" + export PATH="${BATS_TEST_DIRNAME}/../libexec:/usr/bin:/bin:/usr/local/bin" run rbenv-init - fish assert_success assert_line 0 "setenv PATH '${RBENV_ROOT}/shims' \$PATH" diff --git a/test/test_helper.bash b/test/test_helper.bash index 01d9fb99..43b04d3b 100644 --- a/test/test_helper.bash +++ b/test/test_helper.bash @@ -8,7 +8,7 @@ if [ "$RBENV_ROOT" != "${RBENV_TEST_DIR}/root" ]; then export RBENV_ROOT="${RBENV_TEST_DIR}/root" export HOME="${RBENV_TEST_DIR}/home" - PATH=/usr/bin:/bin:/usr/sbin:/sbin + 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"