diff --git a/tests/test_in_vterm/test.sh b/tests/test_in_vterm/test.sh index deafb560..b76d03f7 100755 --- a/tests/test_in_vterm/test.sh +++ b/tests/test_in_vterm/test.sh @@ -2,8 +2,6 @@ . tests/bot-ci/scripts/common/main.sh set +x -: ${POWERLINE_TMUX_EXE:=tmux} - FAILED=0 rm -rf tests/vterm @@ -26,11 +24,12 @@ test_tmux() { if ! which "${POWERLINE_TMUX_EXE}" ; then return 0 fi - ln -s "$(which "${POWERLINE_TMUX_EXE}")" tests/vterm/path - if ! "${PYTHON}" tests/test_in_vterm/test_tmux.py; then + ln -sf "$(which "${POWERLINE_TMUX_EXE}")" tests/vterm/path + f=tests/test_in_vterm/test_tmux.py + if ! "${PYTHON}" $f ; then echo "Failed vterm test $f" FAILED=1 - FAIL_SUMMARY="$FAIL_SUMMARY${NL}F $f" + FAIL_SUMMARY="$FAIL_SUMMARY${NL}F $POWERLINE_TMUX_EXE $f" for file in tests/vterm/*.log ; do if ! test -e "$file" ; then break @@ -43,7 +42,14 @@ test_tmux() { fi } -test_tmux || true +if test -z "$POWERLINE_TMUX_EXE" && test -d tests/bot-ci/deps/tmux ; then + for tmux in tests/bot-ci/deps/tmux/tmux-*/tmux ; do + export POWERLINE_TMUX_EXE="$PWD/$tmux" + test_tmux || true + done +else + test_tmux || true +fi if test $FAILED -eq 0 ; then echo "$FAIL_SUMMARY"