tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure that fish tests are not run for old fishes

This commit is contained in:
ZyX 2015-02-20 23:16:01 +03:00
parent 4d09f4fdb0
commit b349d6e390
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_shells/test.sh
View File

@ -311,6 +311,19 @@ fi
for exe in bash zsh busybox fish tcsh mksh dash ipython ; do for exe in bash zsh busybox fish tcsh mksh dash ipython ; do
if which $exe >/dev/null ; then if which $exe >/dev/null ; then
if test "$exe" = "fish" ; then
fish_version="$(fish --version 2>&1)"
fish_version="${fish_version##* }"
fish_version_major="${fish_version%%.*}"
fish_version_minor="${fish_version#*.}"
fish_version_minor="${fish_version_minor%%.*}"
if test $fish_version_major -lt 2 || ( \
test $fish_version_major -eq 2 && \
test $fish_version_minor -lt 1 \
) ; then
continue
fi
fi
ln -s "$(which $exe)" tests/shell/path ln -s "$(which $exe)" tests/shell/path
fi fi
done done
@ -389,7 +402,7 @@ if test -z "${ONLY_SHELL}" || test "x${ONLY_SHELL%sh}" != "x${ONLY_SHELL}" || te
continue continue
fi fi
fi fi
if test "$TEST_CLIENT" = "shell" && ! which socat >/dev/null ; then if test "$TEST_CLIENT" = "shell" && ! test -x tests/shell/path/socat ; then
continue continue
fi fi
if test "x$ONLY_TEST_CLIENT" != "x" && test "x$TEST_CLIENT" != "x$ONLY_TEST_CLIENT" ; then if test "x$ONLY_TEST_CLIENT" != "x" && test "x$TEST_CLIENT" != "x$ONLY_TEST_CLIENT" ; then