From d9579dbbe91af9e23328faafb92d664ad30c67ef Mon Sep 17 00:00:00 2001 From: w0rp Date: Mon, 23 Jul 2018 20:41:06 +0100 Subject: Get tests to pass in Vim 8.1 --- run-tests | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) (limited to 'run-tests') diff --git a/run-tests b/run-tests index eb0c633d..06fa3547 100755 --- a/run-tests +++ b/run-tests @@ -10,7 +10,7 @@ set -u # image=w0rp/ale -current_image_id=71553d0ab3e8 +current_image_id=67896c9c2c0f # Used in all test scripts for running the selected Docker image. DOCKER_RUN_IMAGE="$image" @@ -22,7 +22,8 @@ verbose_flag='' quiet_flag='' run_neovim_02_tests=1 run_neovim_03_tests=1 -run_vim_tests=1 +run_vim_80_tests=1 +run_vim_81_tests=1 run_linters=1 while [ $# -ne 0 ]; do @@ -36,19 +37,22 @@ while [ $# -ne 0 ]; do shift ;; --neovim-only) - run_vim_tests=0 + run_vim_80_tests=0 + run_vim_81_tests=0 run_linters=0 shift ;; --neovim-02-only) run_neovim_03_tests=0 - run_vim_tests=0 + run_vim_80_tests=0 + run_vim_81_tests=0 run_linters=0 shift ;; --neovim-03-only) run_neovim_02_tests=0 - run_vim_tests=0 + run_vim_80_tests=0 + run_vim_81_tests=0 run_linters=0 shift ;; @@ -58,8 +62,23 @@ while [ $# -ne 0 ]; do run_linters=0 shift ;; + --vim-80-only) + run_neovim_02_tests=0 + run_neovim_03_tests=0 + run_vim_81_tests=0 + run_linters=0 + shift + ;; + --vim-81-only) + run_neovim_02_tests=0 + run_neovim_03_tests=0 + run_vim_80_tests=0 + run_linters=0 + shift + ;; --linters-only) - run_vim_tests=0 + run_vim_80_tests=0 + run_vim_81_tests=0 run_neovim_02_tests=0 run_neovim_03_tests=0 shift @@ -76,7 +95,9 @@ while [ $# -ne 0 ]; do echo ' --neovim-only Run tests only for NeoVim 0.2 and 0.3' echo ' --neovim-02-only Run tests only for NeoVim 0.2' echo ' --neovim-03-only Run tests only for NeoVim 0.3' - echo ' --vim-only Run tests only for Vim' + echo ' --vim-only Run tests only for Vim 8.0 and 8.1' + echo ' --vim-80-only Run tests only for Vim 8.0' + echo ' --vim-81-only Run tests only for Vim 8.1' echo ' --linters-only Run only Vint and custom checks' echo ' --help Show this help text' echo ' -- Stop parsing options after this' @@ -120,12 +141,8 @@ file_number=0 pid_list='' for vim in $(docker run --rm "$DOCKER_RUN_IMAGE" ls /vim-build/bin | grep '^neovim\|^vim' ); do - # Skip Vim 8.1 for now. - if [[ $vim =~ ^vim-v8.1 ]]; then - continue - fi - - if ( [[ $vim =~ ^vim ]] && ((run_vim_tests)) ) \ + if ( [[ $vim =~ ^vim-v8.0 ]] && ((run_vim_80_tests)) ) \ + || ( [[ $vim =~ ^vim-v8.1 ]] && ((run_vim_81_tests)) ) \ || ( [[ $vim =~ ^neovim-v0.2 ]] && ((run_neovim_02_tests)) ) \ || ( [[ $vim =~ ^neovim-v0.3 ]] && ((run_neovim_03_tests)) ); then echo "Starting Vim: $vim..." -- cgit v1.2.3