diff --git a/tests/run_vterm_tests.sh b/tests/run_vterm_tests.sh index 312b817d..1368ba66 100755 --- a/tests/run_vterm_tests.sh +++ b/tests/run_vterm_tests.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e FAILED=0 -if ! sh tests/test_in_vterm/test.sh ; then +if ! sh tests/test_in_vterm/test_tmux.sh ; then echo "Failed vterm" FAILED=1 fi diff --git a/tests/test_in_vterm/test_tmux.py b/tests/test_in_vterm/test_tmux.py index 6454d69c..83705faa 100755 --- a/tests/test_in_vterm/test_tmux.py +++ b/tests/test_in_vterm/test_tmux.py @@ -18,7 +18,7 @@ from powerline import get_fallback_logger from tests.lib.terminal import ExpectProcess -VTERM_TEST_DIR = os.path.abspath('tests/vterm') +VTERM_TEST_DIR = os.path.abspath('tests/vterm_tmux') def cell_properties_key_to_shell_escape(cell_properties_key): diff --git a/tests/test_in_vterm/test.sh b/tests/test_in_vterm/test_tmux.sh similarity index 61% rename from tests/test_in_vterm/test.sh rename to tests/test_in_vterm/test_tmux.sh index f87201fe..a881485f 100755 --- a/tests/test_in_vterm/test.sh +++ b/tests/test_in_vterm/test_tmux.sh @@ -4,18 +4,18 @@ set +x FAILED=0 -rm -rf tests/vterm -mkdir tests/vterm -mkdir tests/vterm/path +rm -rf tests/vterm_tmux +mkdir tests/vterm_tmux +mkdir tests/vterm_tmux/path -ln -s "$(which "${PYTHON}")" tests/vterm/path/python -ln -s "$(which bash)" tests/vterm/path -ln -s "$(which env)" tests/vterm/path -ln -s "$(which cut)" tests/vterm/path -ln -s "$PWD/scripts/powerline-render" tests/vterm/path -ln -s "$PWD/scripts/powerline-config" tests/vterm/path +ln -s "$(which "${PYTHON}")" tests/vterm_tmux/path/python +ln -s "$(which bash)" tests/vterm_tmux/path +ln -s "$(which env)" tests/vterm_tmux/path +ln -s "$(which cut)" tests/vterm_tmux/path +ln -s "$PWD/scripts/powerline-render" tests/vterm_tmux/path +ln -s "$PWD/scripts/powerline-config" tests/vterm_tmux/path -cp -r tests/terminfo tests/vterm +cp -r tests/terminfo tests/vterm_tmux FAIL_SUMMARY="" @@ -28,7 +28,7 @@ test_tmux() { if ! which "${POWERLINE_TMUX_EXE}" ; then return 0 fi - ln -sf "$(which "${POWERLINE_TMUX_EXE}")" tests/vterm/path + ln -sf "$(which "${POWERLINE_TMUX_EXE}")" tests/vterm_tmux/path f=tests/test_in_vterm/test_tmux.py if ! "${PYTHON}" $f ; then echo "Failed vterm test $f" @@ -49,7 +49,7 @@ fi if test $FAILED -eq 0 ; then echo "$FAIL_SUMMARY" - rm -rf tests/vterm + rm -rf tests/vterm_tmux fi exit $FAILED