From 851494a374c0cc2fcc65e6328fcd92f8647686b3 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Sat, 19 May 2018 09:58:27 +1000 Subject: [PATCH] test/run: Rename "display" expected ui output file as "ui-out" --- test/display/horizontal-scroll-onto-tab/{display => ui-out} | 0 test/display/horizontal-scroll-with-tab/{display => ui-out} | 0 test/display/horizontal-scroll/{display => ui-out} | 0 test/display/vertical-scroll/{display => ui-out} | 0 test/highlight/column/multi-columns/{display => ui-out} | 0 test/highlight/regions/{display => ui-out} | 0 test/highlight/wrap/avoid-odd-places/{display => ui-out} | 0 .../{display => ui-out} | 0 .../1433-scrolloff-broken-with-soft-wrap/{display => ui-out} | 0 .../{display => ui-out} | 0 .../{display => ui-out} | 0 test/regression/1731-wrap-hidden-buffer/{display => ui-out} | 0 .../1741-scrolloff-hides-end-of-lines/{display => ui-out} | 0 .../1920-crash-on-python-in-docstring/{display => ui-out} | 0 .../638-highlight-codepoint-with-bracket/{display => ui-out} | 0 test/run | 4 ++-- 16 files changed, 2 insertions(+), 2 deletions(-) rename test/display/horizontal-scroll-onto-tab/{display => ui-out} (100%) rename test/display/horizontal-scroll-with-tab/{display => ui-out} (100%) rename test/display/horizontal-scroll/{display => ui-out} (100%) rename test/display/vertical-scroll/{display => ui-out} (100%) rename test/highlight/column/multi-columns/{display => ui-out} (100%) rename test/highlight/regions/{display => ui-out} (100%) rename test/highlight/wrap/avoid-odd-places/{display => ui-out} (100%) rename test/regression/1382-column-highlighter-broken-on-horizontal-scroll/{display => ui-out} (100%) rename test/regression/1433-scrolloff-broken-with-soft-wrap/{display => ui-out} (100%) rename test/regression/1435-misplaced-cursor-with-show_matching-hl/{display => ui-out} (100%) rename test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/{display => ui-out} (100%) rename test/regression/1731-wrap-hidden-buffer/{display => ui-out} (100%) rename test/regression/1741-scrolloff-hides-end-of-lines/{display => ui-out} (100%) rename test/regression/1920-crash-on-python-in-docstring/{display => ui-out} (100%) rename test/regression/638-highlight-codepoint-with-bracket/{display => ui-out} (100%) diff --git a/test/display/horizontal-scroll-onto-tab/display b/test/display/horizontal-scroll-onto-tab/ui-out similarity index 100% rename from test/display/horizontal-scroll-onto-tab/display rename to test/display/horizontal-scroll-onto-tab/ui-out diff --git a/test/display/horizontal-scroll-with-tab/display b/test/display/horizontal-scroll-with-tab/ui-out similarity index 100% rename from test/display/horizontal-scroll-with-tab/display rename to test/display/horizontal-scroll-with-tab/ui-out diff --git a/test/display/horizontal-scroll/display b/test/display/horizontal-scroll/ui-out similarity index 100% rename from test/display/horizontal-scroll/display rename to test/display/horizontal-scroll/ui-out diff --git a/test/display/vertical-scroll/display b/test/display/vertical-scroll/ui-out similarity index 100% rename from test/display/vertical-scroll/display rename to test/display/vertical-scroll/ui-out diff --git a/test/highlight/column/multi-columns/display b/test/highlight/column/multi-columns/ui-out similarity index 100% rename from test/highlight/column/multi-columns/display rename to test/highlight/column/multi-columns/ui-out diff --git a/test/highlight/regions/display b/test/highlight/regions/ui-out similarity index 100% rename from test/highlight/regions/display rename to test/highlight/regions/ui-out diff --git a/test/highlight/wrap/avoid-odd-places/display b/test/highlight/wrap/avoid-odd-places/ui-out similarity index 100% rename from test/highlight/wrap/avoid-odd-places/display rename to test/highlight/wrap/avoid-odd-places/ui-out diff --git a/test/regression/1382-column-highlighter-broken-on-horizontal-scroll/display b/test/regression/1382-column-highlighter-broken-on-horizontal-scroll/ui-out similarity index 100% rename from test/regression/1382-column-highlighter-broken-on-horizontal-scroll/display rename to test/regression/1382-column-highlighter-broken-on-horizontal-scroll/ui-out diff --git a/test/regression/1433-scrolloff-broken-with-soft-wrap/display b/test/regression/1433-scrolloff-broken-with-soft-wrap/ui-out similarity index 100% rename from test/regression/1433-scrolloff-broken-with-soft-wrap/display rename to test/regression/1433-scrolloff-broken-with-soft-wrap/ui-out diff --git a/test/regression/1435-misplaced-cursor-with-show_matching-hl/display b/test/regression/1435-misplaced-cursor-with-show_matching-hl/ui-out similarity index 100% rename from test/regression/1435-misplaced-cursor-with-show_matching-hl/display rename to test/regression/1435-misplaced-cursor-with-show_matching-hl/ui-out diff --git a/test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/display b/test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/ui-out similarity index 100% rename from test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/display rename to test/regression/1453-show_whitespaces-highlighter-breaks-tab-alignment/ui-out diff --git a/test/regression/1731-wrap-hidden-buffer/display b/test/regression/1731-wrap-hidden-buffer/ui-out similarity index 100% rename from test/regression/1731-wrap-hidden-buffer/display rename to test/regression/1731-wrap-hidden-buffer/ui-out diff --git a/test/regression/1741-scrolloff-hides-end-of-lines/display b/test/regression/1741-scrolloff-hides-end-of-lines/ui-out similarity index 100% rename from test/regression/1741-scrolloff-hides-end-of-lines/display rename to test/regression/1741-scrolloff-hides-end-of-lines/ui-out diff --git a/test/regression/1920-crash-on-python-in-docstring/display b/test/regression/1920-crash-on-python-in-docstring/ui-out similarity index 100% rename from test/regression/1920-crash-on-python-in-docstring/display rename to test/regression/1920-crash-on-python-in-docstring/ui-out diff --git a/test/regression/638-highlight-codepoint-with-bracket/display b/test/regression/638-highlight-codepoint-with-bracket/ui-out similarity index 100% rename from test/regression/638-highlight-codepoint-with-bracket/display rename to test/regression/638-highlight-codepoint-with-bracket/ui-out diff --git a/test/run b/test/run index 67367d9f..e6bc386d 100755 --- a/test/run +++ b/test/run @@ -58,7 +58,7 @@ main() { touch in; cp in out session="kak-tests" rm -f $tmpdir/kakoune/$USER/$session - $root/../src/kak out -n -s "$session" -ui json -e "$kak_commands" > display + $root/../src/kak out -n -s "$session" -ui json -e "$kak_commands" > ui-out retval=$? failed=0 if [ ! -e error ]; then # failure not expected @@ -67,7 +67,7 @@ main() { echo "$indent Kakoune returned error $retval" failed=1 else - for file in out selections state display; do + for file in out selections state ui-out; do if [ -f $root/$dir/$file ] && ! cmp -s $root/$dir/$file $file; then if [ $failed -eq 0 ]; then echo "$indent$name" | colorize $red $none