A few further tweaks to how path handling in tests

This commit is contained in:
2014-05-24 11:46:48 +01:00
parent 1fb80660b8
commit e5ffdc6f16
3 changed files with 15 additions and 5 deletions

View File

@@ -5,22 +5,29 @@ source "../test-helper.sh"
# env.sh tests. # env.sh tests.
# #
# Setup.
realTMUXIFIER="$TMUXIFIER"
TMUXIFER="/path/to/tmuxifier"
# When TMUXIFIER_LAYOUT_PATH is not set. # When TMUXIFIER_LAYOUT_PATH is not set.
source "../../lib/env.sh" source "${root}/lib/env.sh"
assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts" assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts"
# When TMUXIFIER_LAYOUT_PATH is set and has a trailing slash. # When TMUXIFIER_LAYOUT_PATH is set and has a trailing slash.
TMUXIFIER_LAYOUT_PATH="/path/to/layouts/" TMUXIFIER_LAYOUT_PATH="/path/to/layouts/"
source "../../lib/env.sh" source "${root}/lib/env.sh"
assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts" assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts"
unset TMUXIFIER_LAYOUT_PATH unset TMUXIFIER_LAYOUT_PATH
# When TMUXIFIER_LAYOUT_PATH is set and does not have a trailing slash. # When TMUXIFIER_LAYOUT_PATH is set and does not have a trailing slash.
TMUXIFIER_LAYOUT_PATH="/path/to/layouts" TMUXIFIER_LAYOUT_PATH="/path/to/layouts"
source "../../lib/env.sh" source "${root}/lib/env.sh"
assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts" assert 'echo $TMUXIFIER_LAYOUT_PATH' "/path/to/layouts"
unset TMUXIFIER_LAYOUT_PATH unset TMUXIFIER_LAYOUT_PATH
# Tear down.
TMUXIFER="$realTMUXIFIER"
unset realTMUXIFIER
# End of tests. # End of tests.
assert_end "env.sh" assert_end "env.sh"

View File

@@ -5,7 +5,7 @@ source "../test-helper.sh"
# runtime.sh tests. # runtime.sh tests.
# #
source "../../lib/runtime.sh" source "${root}/lib/runtime.sh"
# We assume env.sh has been sourced if $TMUXIFIER_LAYOUT_PATH has been set. # We assume env.sh has been sourced if $TMUXIFIER_LAYOUT_PATH has been set.
assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts" assert 'echo $TMUXIFIER_LAYOUT_PATH' "${TMUXIFIER}/layouts"

View File

@@ -21,8 +21,11 @@ abs_dirname() {
# Set testroot variable. # Set testroot variable.
testroot="$(abs_dirname "$BASH_SOURCE")" testroot="$(abs_dirname "$BASH_SOURCE")"
# Set root variable.
root="$(abs_dirname "$testroot/../..")"
# Set TMUXIFIER environment variable # Set TMUXIFIER environment variable
TMUXIFIER="$(abs_dirname "$testroot/../..")" TMUXIFIER="$root"
# Unset various Tmuxifier environment variables to prevent a local install of # Unset various Tmuxifier environment variables to prevent a local install of
# Tmuxifier interfering with tests. # Tmuxifier interfering with tests.