diff --git a/Makefile b/Makefile index cc4e57b..e4fa163 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ test: $(ZSH) -f tests/test-highlighting.zsh "$${test##*/}"; \ : $$(( result |= $$? )); \ fi \ - done | $(ZSH) -f tests/tap-colorizer.zsh; \ + done; \ exit $$result perf: diff --git a/tests/tap-colorizer.zsh b/tests/tap-colorizer.zsh old mode 100644 new mode 100755 diff --git a/tests/test-highlighting.zsh b/tests/test-highlighting.zsh index a67229a..1eed974 100755 --- a/tests/test-highlighting.zsh +++ b/tests/test-highlighting.zsh @@ -59,6 +59,8 @@ run_test() { local -a highlight_zone local unused_highlight='bg=red,underline' # a style unused by anything else, for tests to use + echo "# ${1:t:r}" + # Load the data and prepare checking it. PREBUFFER= BUFFER= ; . "$1" @@ -109,8 +111,7 @@ run_test() { # Process each test data file in test data directory. integer something_failed=0 for data_file in ${0:h:h}/highlighters/$1/test-data/*.zsh; do - echo "# ${data_file:t:r}" - (run_test "$data_file") | tee >(cat) | grep -v '^not ok.*# TODO' | grep -q '^not ok\|^ok.*# TODO' && (( something_failed=1 )) + (run_test "$data_file") | tee >(${0:A:h}/tap-colorizer.zsh) | grep -v '^not ok.*# TODO' | grep -q '^not ok\|^ok.*# TODO' && (( something_failed=1 )) (( $pipestatus[1] )) && exit 2 done