Move the Bash code for running Vader tests to its own file
This commit is contained in:
parent
51b127a4fd
commit
499c154272
146
run-tests
146
run-tests
@ -9,17 +9,15 @@
|
|||||||
# --neovim-only Run tests only for NeoVim
|
# --neovim-only Run tests only for NeoVim
|
||||||
# --vim-only Run tests only for Vim
|
# --vim-only Run tests only for Vim
|
||||||
|
|
||||||
RED='\033[0;31m'
|
current_image_id=d5a1b5915b09
|
||||||
GREEN='\033[0;32m'
|
image=w0rp/ale
|
||||||
NC='\033[0m'
|
docker_flags=(--rm -v "$PWD:/testplugin" -v "$PWD/test:/home" -w /testplugin "$image")
|
||||||
CURRENT_IMAGE_ID=d5a1b5915b09
|
exit_code=0
|
||||||
IMAGE=w0rp/ale
|
|
||||||
DOCKER_FLAGS=(--rm -v "$PWD:/testplugin" -v "$PWD/test:/home" -w /testplugin "$IMAGE")
|
|
||||||
EXIT=0
|
|
||||||
|
|
||||||
tests='test/*.vader test/*/*.vader test/*/*/*.vader test/*/*/*.vader'
|
tests='test/*.vader test/*/*.vader test/*/*/*.vader test/*/*/*.vader'
|
||||||
verbose=0
|
# These flags are forwarded to the script for running Vader tests.
|
||||||
quiet=0
|
verbose_flag=''
|
||||||
|
quiet_flag=''
|
||||||
run_neovim_tests=1
|
run_neovim_tests=1
|
||||||
run_vim_tests=1
|
run_vim_tests=1
|
||||||
run_vint=1
|
run_vint=1
|
||||||
@ -28,11 +26,11 @@ run_custom_checks=1
|
|||||||
while [ $# -ne 0 ]; do
|
while [ $# -ne 0 ]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
-v)
|
-v)
|
||||||
verbose=1
|
verbose_flag='-v'
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
-q)
|
-q)
|
||||||
quiet=1
|
quiet_flag='-q'
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--neovim-only)
|
--neovim-only)
|
||||||
@ -85,108 +83,16 @@ fi
|
|||||||
# Delete .swp files in the test directory, which cause Vim 8 to hang.
|
# Delete .swp files in the test directory, which cause Vim 8 to hang.
|
||||||
find test -name '*.swp' -delete
|
find test -name '*.swp' -delete
|
||||||
|
|
||||||
docker images -q w0rp/ale | grep "^$CURRENT_IMAGE_ID" > /dev/null \
|
docker images -q w0rp/ale | grep "^$current_image_id" > /dev/null \
|
||||||
|| docker pull "$IMAGE"
|
|| docker pull "$image"
|
||||||
|
|
||||||
function filter-vader-output() {
|
for vim in $(docker run --rm "$image" ls /vim-build/bin | grep '^neovim\|^vim' ); do
|
||||||
# When verbose mode is off, suppress output until Vader starts.
|
if [[ $vim =~ ^neovim ]] && ((run_neovim_tests)); then
|
||||||
local start_output="$verbose"
|
test/script/run-vader-tests $quiet_flag $verbose_flag "$vim" "$tests"
|
||||||
local filtered_data=''
|
elif ((run_vim_tests)); then
|
||||||
|
test/script/run-vader-tests $quiet_flag $verbose_flag "$vim" "$tests"
|
||||||
while read -r; do
|
fi
|
||||||
if ((!start_output)); then
|
done
|
||||||
if [[ "$REPLY" = *'Starting Vader:'* ]]; then
|
|
||||||
start_output=1
|
|
||||||
else
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ((quiet)); then
|
|
||||||
if [[ "$REPLY" = *'Starting Vader:'* ]]; then
|
|
||||||
filtered_data="$REPLY"
|
|
||||||
elif [[ "$REPLY" = *'Success/Total'* ]]; then
|
|
||||||
success="$(echo -n "$REPLY" | grep -o '[0-9]\+/' | head -n1 | cut -d/ -f1)"
|
|
||||||
total="$(echo -n "$REPLY" | grep -o '/[0-9]\+' | head -n1 | cut -d/ -f2)"
|
|
||||||
|
|
||||||
if [ "$success" -lt "$total" ]; then
|
|
||||||
echo "$filtered_data"
|
|
||||||
echo "$REPLY"
|
|
||||||
fi
|
|
||||||
|
|
||||||
filtered_data=''
|
|
||||||
else
|
|
||||||
filtered_data="$filtered_data"$'\n'"$REPLY"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "$REPLY"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
function color-vader-output() {
|
|
||||||
while read -r; do
|
|
||||||
if [[ "$REPLY" = *'[EXECUTE] (X)'* ]]; then
|
|
||||||
echo -en "$RED"
|
|
||||||
elif [[ "$REPLY" = *'[EXECUTE]'* ]] || [[ "$REPLY" = *'[ GIVEN]'* ]]; then
|
|
||||||
echo -en "$NC"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$REPLY" = *'Success/Total'* ]]; then
|
|
||||||
success="$(echo -n "$REPLY" | grep -o '[0-9]\+/' | head -n1 | cut -d/ -f1)"
|
|
||||||
total="$(echo -n "$REPLY" | grep -o '/[0-9]\+' | head -n1 | cut -d/ -f2)"
|
|
||||||
|
|
||||||
if [ "$success" -lt "$total" ]; then
|
|
||||||
echo -en "$RED"
|
|
||||||
else
|
|
||||||
echo -en "$GREEN"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$REPLY"
|
|
||||||
echo -en "$NC"
|
|
||||||
else
|
|
||||||
echo "$REPLY"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo -en "$NC"
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((run_neovim_tests)); then
|
|
||||||
for vim in $(docker run --rm "$IMAGE" ls /vim-build/bin | grep '^neovim' ); do
|
|
||||||
echo
|
|
||||||
echo '========================================'
|
|
||||||
echo "Running tests for $vim"
|
|
||||||
echo '========================================'
|
|
||||||
echo
|
|
||||||
|
|
||||||
set -o pipefail
|
|
||||||
docker run -it -e VADER_OUTPUT_FILE=/dev/stderr "${DOCKER_FLAGS[@]}" \
|
|
||||||
"/vim-build/bin/$vim" -u test/vimrc \
|
|
||||||
--headless "+Vader! $tests" | filter-vader-output | color-vader-output || EXIT=$?
|
|
||||||
set +o pipefail
|
|
||||||
done
|
|
||||||
|
|
||||||
echo
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ((run_vim_tests)); then
|
|
||||||
for vim in $(docker run --rm "$IMAGE" ls /vim-build/bin | grep '^vim' ); do
|
|
||||||
echo
|
|
||||||
echo '========================================'
|
|
||||||
echo "Running tests for $vim"
|
|
||||||
echo '========================================'
|
|
||||||
echo
|
|
||||||
|
|
||||||
set -o pipefail
|
|
||||||
docker run -a stderr -e VADER_OUTPUT_FILE=/dev/stderr "${DOCKER_FLAGS[@]}" \
|
|
||||||
"/vim-build/bin/$vim" -u test/vimrc \
|
|
||||||
"+Vader! $tests" 2>&1 | filter-vader-output | color-vader-output || EXIT=$?
|
|
||||||
set +o pipefail
|
|
||||||
done
|
|
||||||
|
|
||||||
echo
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ((run_vint)); then
|
if ((run_vint)); then
|
||||||
echo '========================================'
|
echo '========================================'
|
||||||
@ -196,7 +102,7 @@ if ((run_vint)); then
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
docker run -a stdout "${DOCKER_FLAGS[@]}" vint -s . || EXIT=$?
|
docker run -a stdout "${docker_flags[@]}" vint -s . || exit_code=$?
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
@ -209,7 +115,7 @@ if ((run_custom_checks)); then
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
docker run -a stdout "${DOCKER_FLAGS[@]}" test/script/custom-checks . || EXIT=$?
|
docker run -a stdout "${docker_flags[@]}" test/script/custom-checks . || exit_code=$?
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
echo
|
echo
|
||||||
|
|
||||||
@ -219,7 +125,7 @@ if ((run_custom_checks)); then
|
|||||||
echo 'Duplicate tags follow:'
|
echo 'Duplicate tags follow:'
|
||||||
echo
|
echo
|
||||||
|
|
||||||
grep --exclude=tags -roh '\*.*\*$' doc | sort | uniq -d || EXIT=$?
|
grep --exclude=tags -roh '\*.*\*$' doc | sort | uniq -d || exit_code=$?
|
||||||
|
|
||||||
echo '========================================'
|
echo '========================================'
|
||||||
echo 'Checking for invalid tag references'
|
echo 'Checking for invalid tag references'
|
||||||
@ -234,7 +140,7 @@ if ((run_custom_checks)); then
|
|||||||
diff -u \
|
diff -u \
|
||||||
<(grep --exclude=tags -roh "\*$tag_regex\*" doc | sort -u | sed 's/*//g') \
|
<(grep --exclude=tags -roh "\*$tag_regex\*" doc | sort -u | sed 's/*//g') \
|
||||||
<(grep --exclude=tags -roh "|$tag_regex|" doc | sort -u | sed 's/|//g') \
|
<(grep --exclude=tags -roh "|$tag_regex|" doc | sort -u | sed 's/|//g') \
|
||||||
| grep '^+[^+]' && EXIT=1
|
| grep '^+[^+]' && exit_code=1
|
||||||
|
|
||||||
echo '========================================'
|
echo '========================================'
|
||||||
echo 'diff README.md and doc/ale.txt tables'
|
echo 'diff README.md and doc/ale.txt tables'
|
||||||
@ -242,7 +148,7 @@ if ((run_custom_checks)); then
|
|||||||
echo 'Differences follow:'
|
echo 'Differences follow:'
|
||||||
echo
|
echo
|
||||||
|
|
||||||
test/script/check-supported-tools-tables || EXIT=$?
|
test/script/check-supported-tools-tables || exit_code=$?
|
||||||
|
|
||||||
echo '========================================'
|
echo '========================================'
|
||||||
echo 'Look for badly aligned doc tags'
|
echo 'Look for badly aligned doc tags'
|
||||||
@ -254,14 +160,14 @@ if ((run_custom_checks)); then
|
|||||||
# tags which aren't at the right margin.
|
# tags which aren't at the right margin.
|
||||||
grep ' \*[^*]\+\*$' doc/ -r \
|
grep ' \*[^*]\+\*$' doc/ -r \
|
||||||
| awk '{ sep = index($0, ":"); if (length(substr($0, sep + 1 )) < 79) { print } }' \
|
| awk '{ sep = index($0, ":"); if (length(substr($0, sep + 1 )) < 79) { print } }' \
|
||||||
| grep . && EXIT=1
|
| grep . && exit_code=1
|
||||||
|
|
||||||
echo '========================================'
|
echo '========================================'
|
||||||
echo 'Look for table of contents issues'
|
echo 'Look for table of contents issues'
|
||||||
echo '========================================'
|
echo '========================================'
|
||||||
echo
|
echo
|
||||||
|
|
||||||
test/script/check-toc || EXIT=$?
|
test/script/check-toc || exit_code=$?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit $EXIT
|
exit $exit_code
|
||||||
|
120
test/script/run-vader-tests
Executable file
120
test/script/run-vader-tests
Executable file
@ -0,0 +1,120 @@
|
|||||||
|
#!/bin/bash -eu
|
||||||
|
|
||||||
|
image=w0rp/ale
|
||||||
|
docker_flags=(--rm -v "$PWD:/testplugin" -v "$PWD/test:/home" -w /testplugin "$image")
|
||||||
|
red='\033[0;31m'
|
||||||
|
green='\033[0;32m'
|
||||||
|
nc='\033[0m'
|
||||||
|
verbose=0
|
||||||
|
quiet=0
|
||||||
|
|
||||||
|
while [ $# -ne 0 ]; do
|
||||||
|
case $1 in
|
||||||
|
-v)
|
||||||
|
verbose=1
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
-q)
|
||||||
|
quiet=1
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--)
|
||||||
|
shift
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
-?*)
|
||||||
|
echo "Invalid argument: $1" 1>&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
vim="$1"
|
||||||
|
tests="$2"
|
||||||
|
|
||||||
|
function filter-vader-output() {
|
||||||
|
# When verbose mode is off, suppress output until Vader starts.
|
||||||
|
local start_output="$verbose"
|
||||||
|
local filtered_data=''
|
||||||
|
|
||||||
|
while read -r; do
|
||||||
|
if ((!start_output)); then
|
||||||
|
if [[ "$REPLY" = *'Starting Vader:'* ]]; then
|
||||||
|
start_output=1
|
||||||
|
else
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ((quiet)); then
|
||||||
|
if [[ "$REPLY" = *'Starting Vader:'* ]]; then
|
||||||
|
filtered_data="$REPLY"
|
||||||
|
elif [[ "$REPLY" = *'Success/Total'* ]]; then
|
||||||
|
success="$(echo -n "$REPLY" | grep -o '[0-9]\+/' | head -n1 | cut -d/ -f1)"
|
||||||
|
total="$(echo -n "$REPLY" | grep -o '/[0-9]\+' | head -n1 | cut -d/ -f2)"
|
||||||
|
|
||||||
|
if [ "$success" -lt "$total" ]; then
|
||||||
|
echo "$filtered_data"
|
||||||
|
echo "$REPLY"
|
||||||
|
fi
|
||||||
|
|
||||||
|
filtered_data=''
|
||||||
|
else
|
||||||
|
filtered_data="$filtered_data"$'\n'"$REPLY"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "$REPLY"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
function color-vader-output() {
|
||||||
|
while read -r; do
|
||||||
|
if [[ "$REPLY" = *'[EXECUTE] (X)'* ]]; then
|
||||||
|
echo -en "$red"
|
||||||
|
elif [[ "$REPLY" = *'[EXECUTE]'* ]] || [[ "$REPLY" = *'[ GIVEN]'* ]]; then
|
||||||
|
echo -en "$nc"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$REPLY" = *'Success/Total'* ]]; then
|
||||||
|
success="$(echo -n "$REPLY" | grep -o '[0-9]\+/' | head -n1 | cut -d/ -f1)"
|
||||||
|
total="$(echo -n "$REPLY" | grep -o '/[0-9]\+' | head -n1 | cut -d/ -f2)"
|
||||||
|
|
||||||
|
if [ "$success" -lt "$total" ]; then
|
||||||
|
echo -en "$red"
|
||||||
|
else
|
||||||
|
echo -en "$green"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$REPLY"
|
||||||
|
echo -en "$nc"
|
||||||
|
else
|
||||||
|
echo "$REPLY"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
echo -en "$nc"
|
||||||
|
}
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo '========================================'
|
||||||
|
echo "Running tests for $vim"
|
||||||
|
echo '========================================'
|
||||||
|
echo
|
||||||
|
|
||||||
|
if [[ $vim =~ ^neovim ]]; then
|
||||||
|
set -o pipefail
|
||||||
|
docker run -it -e VADER_OUTPUT_FILE=/dev/stderr "${docker_flags[@]}" \
|
||||||
|
"/vim-build/bin/$vim" -u test/vimrc \
|
||||||
|
--headless "+Vader! $tests" | filter-vader-output | color-vader-output
|
||||||
|
set +o pipefail
|
||||||
|
else
|
||||||
|
set -o pipefail
|
||||||
|
docker run -a stderr -e VADER_OUTPUT_FILE=/dev/stderr "${docker_flags[@]}" \
|
||||||
|
"/vim-build/bin/$vim" -u test/vimrc \
|
||||||
|
"+Vader! $tests" 2>&1 | filter-vader-output | color-vader-output
|
||||||
|
set +o pipefail
|
||||||
|
fi
|
Loading…
Reference in New Issue
Block a user