X04 Test Failure

X04 Test Failure

[Vin Shelton]

[-- Attachment #1: Type: text/plain, Size: 2053 bytes --]

In the latest sources, I'm seeing the following failure:

TESTNUM=X04 ZTST_VERBOSE=1 make check
cd Test ; make check
make[1]: Entering directory '/opt/build/zsh-2023-01-11/Test'
if test -n "gcc"; then \
  cd .. && DESTDIR= \
  make MODDIR=`pwd`/Test/Modules install.modules > /dev/null; \
fi
if test -z "$ZTST_handler"; then \
  ZTST_handler=runtests.zsh; \
fi; \
if ZTST_testlist="`for f in ../../../src/zsh-2023-01-11/Test/X04*.ztst; \
           do echo $f; done`" \
 ZTST_srcdir="../../../src/zsh-2023-01-11/Test" \
 ZTST_exe=../Src/zsh \
 ../Src/zsh +Z -f ../../../src/zsh-2023-01-11/Test/$ZTST_handler; then \
 stat=0; \
else \
 stat=1; \
fi; \
sleep 1; \
rm -rf Modules .zcompdump; \
exit $stat
../../../src/zsh-2023-01-11/Test/X04zlehighlight.ztst: starting.
--- /tmp/zsh.ztst.154780/ztst.out 2023-01-11 11:22:40.763144543 -0500
+++ /tmp/zsh.ztst.154780/ztst.tout 2023-01-11 11:22:40.763144543 -0500
@@ -1 +1 @@
-0m27m24mtr7mu0me word2 word3
+0mtr7mu0me word2 word3
Test ../../../src/zsh-2023-01-11/Test/X04zlehighlight.ztst failed: output
differs from expected as shown above for:
  zpty_start
  zpty_input 'rh_widget() { BUFFER="true word2 word3"; region_highlight+=(
"0 4 fg=196" ); rh2; }'
  zpty_input 'rh2() { region_highlight=( "2 3 standout" ); };' # note the
=, not +=
  zpty_input 'zle -N rh_widget'
  zpty_input 'bindkey "\C-a" rh_widget'
  zpty_enable_zle
  zpty_input $'\C-a'  # emits newline, which executes BUFFER="true" command
  zpty_line 1 p       # the line of interest, preserving escapes ("p")
  zpty_stop
Was testing: region highlight - standout overlapping on other
region_highlight entry
../../../src/zsh-2023-01-11/Test/X04zlehighlight.ztst: test failed.
**************************************
0 successful test scripts, 1 failure, 0 skipped
**************************************
make[1]: *** [Makefile:190: check] Error 1
make[1]: Leaving directory '/opt/build/zsh-2023-01-11/Test'
make: *** [Makefile:263: check] Error 2

Oliver - do you have a test update to reflect your region-highlighting
changes?

Thanks,
  Vin

[-- Attachment #2: Type: text/html, Size: 3370 bytes --]

Re: X04 Test Failure

[Oliver Kiddle]

Vin Shelton wrote:
> Oliver - do you have a test update to reflect your region-highlighting changes?

Sorry yes, forgot to recheck the tests following the smaller later
patches. For some tests, the final 0m was not needed because ZLE is now
tracking the state in one place only so this is optimised away. Most
of them are due to 51289 where I removed the superfluous disabling of
underline and standout after it turns all attributes off.

Thanks for checking.

Oliver

diff --git a/Test/X04zlehighlight.ztst b/Test/X04zlehighlight.ztst
index 6d9ca4a48..296635bf5 100644
--- a/Test/X04zlehighlight.ztst
+++ b/Test/X04zlehighlight.ztst
@@ -79,7 +79,7 @@
   zpty_line 1 p       # the line of interest, preserving escapes ("p")
   zpty_stop
 0:region highlight - standout overlapping on other region_highlight entry
->0m27m24mtr7mu0me word2 word3
+>0mtr7mu0me word2 word3
 
   zpty_start
   zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4 fg=green" ); }'
@@ -90,7 +90,7 @@
   zpty_line 1 p       # the line of interest, preserving escapes ("p")
   zpty_stop
 0:basic region_highlight with 8 colors
->0m27m24mCDE|32|true0m
+>0mCDE|32|true
 
   zpty_start
   zpty_input 'rh_widget() { region_highlight+=( "0 4 fg=green memo=someplugin" ); typeset -p region_highlight }'
@@ -145,7 +145,7 @@
   zpty_line 1 p       # the line of interest, preserving escapes ("p")
   zpty_stop
 0:basic region_highlight with true-color (hex-triplets)
->0m27m24m38;2;4;8;16mtrue0m
+>0m38;2;4;8;16mtrue
 
   zpty_start
   zpty_input 'zmodload zsh/nearcolor'
@@ -157,7 +157,7 @@
   zpty_line 1 p       # the line of interest, preserving escapes ("p")
   zpty_stop
 0:basic region_highlight with near-color (hex-triplets at input)
->0m27m24mCDE|3232|true0m
+>0mCDE|3232|true
 
   zpty_start
   zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4 fg=green" ); rh2; }'
@@ -169,7 +169,7 @@
   zpty_line 1 p       # the line of interest, preserving escapes ("p")
   zpty_stop
 0:overlapping region_highlight with 8 colors
->0m27m24mCDE|32|tCDE|31|rCDE|32|ue0m
+>0mCDE|32|tCDE|31|rCDE|32|ue
 
   zpty_start
   zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4 fg=#00cc00" ); rh2; }'
@@ -181,7 +181,7 @@
   zpty_line 1 p       # the line of interest, preserving escapes ("p")
   zpty_stop
 0:overlapping region_highlight with true-color
->0m27m24m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue0m
+>0m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue
 
   zpty_start
   zpty_input 'zmodload zsh/nearcolor'
@@ -194,7 +194,7 @@
   zpty_line 1 p       # the line of interest, preserving escapes ("p")
   zpty_stop
 0:overlapping region_highlight with near-color (hex-triplets at input)
->0m27m24mCDE|340|tCDE|3160|rCDE|340|ue0m
+>0mCDE|340|tCDE|3160|rCDE|340|ue
 
   zpty_start
   zpty_input 'f () { zle clear-screen; zle g -f nolast; BUFFER=": ${(q)LASTWIDGET}" }; zle -N f'
@@ -205,7 +205,7 @@
   zpty_line 1 p
   zpty_stop
 0:zle $widgetname -f nolast
->0m27m24m0m27m24m: clear-screen
+>0m0m: clear-screen
 
 %clean
 

Re: X04 Test Failure

[Vin Shelton]

[-- Attachment #1: Type: text/plain, Size: 3411 bytes --]

I can confirm that the latest sources build and test 100%.  Thanks - I'm
sorry I didn't learn the test sufficiently to develop my own patch.

  - Vin

On Wed, Jan 11, 2023 at 12:38 PM Oliver Kiddle <opk@zsh.org> wrote:

> Vin Shelton wrote:
> > Oliver - do you have a test update to reflect your region-highlighting
> changes?
>
> Sorry yes, forgot to recheck the tests following the smaller later
> patches. For some tests, the final 0m was not needed because ZLE is now
> tracking the state in one place only so this is optimised away. Most
> of them are due to 51289 where I removed the superfluous disabling of
> underline and standout after it turns all attributes off.
>
> Thanks for checking.
>
> Oliver
>
> diff --git a/Test/X04zlehighlight.ztst b/Test/X04zlehighlight.ztst
> index 6d9ca4a48..296635bf5 100644
> --- a/Test/X04zlehighlight.ztst
> +++ b/Test/X04zlehighlight.ztst
> @@ -79,7 +79,7 @@
>    zpty_line 1 p       # the line of interest, preserving escapes ("p")
>    zpty_stop
>  0:region highlight - standout overlapping on other region_highlight entry
> ->0m27m24mtr7mu0me word2 word3
> +>0mtr7mu0me word2 word3
>
>    zpty_start
>    zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4
> fg=green" ); }'
> @@ -90,7 +90,7 @@
>    zpty_line 1 p       # the line of interest, preserving escapes ("p")
>    zpty_stop
>  0:basic region_highlight with 8 colors
> ->0m27m24mCDE|32|true0m
> +>0mCDE|32|true
>
>    zpty_start
>    zpty_input 'rh_widget() { region_highlight+=( "0 4 fg=green
> memo=someplugin" ); typeset -p region_highlight }'
> @@ -145,7 +145,7 @@
>    zpty_line 1 p       # the line of interest, preserving escapes ("p")
>    zpty_stop
>  0:basic region_highlight with true-color (hex-triplets)
> ->0m27m24m38;2;4;8;16mtrue0m
> +>0m38;2;4;8;16mtrue
>
>    zpty_start
>    zpty_input 'zmodload zsh/nearcolor'
> @@ -157,7 +157,7 @@
>    zpty_line 1 p       # the line of interest, preserving escapes ("p")
>    zpty_stop
>  0:basic region_highlight with near-color (hex-triplets at input)
> ->0m27m24mCDE|3232|true0m
> +>0mCDE|3232|true
>
>    zpty_start
>    zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4
> fg=green" ); rh2; }'
> @@ -169,7 +169,7 @@
>    zpty_line 1 p       # the line of interest, preserving escapes ("p")
>    zpty_stop
>  0:overlapping region_highlight with 8 colors
> ->0m27m24mCDE|32|tCDE|31|rCDE|32|ue0m
> +>0mCDE|32|tCDE|31|rCDE|32|ue
>
>    zpty_start
>    zpty_input 'rh_widget() { BUFFER="true"; region_highlight+=( "0 4
> fg=#00cc00" ); rh2; }'
> @@ -181,7 +181,7 @@
>    zpty_line 1 p       # the line of interest, preserving escapes ("p")
>    zpty_stop
>  0:overlapping region_highlight with true-color
> ->0m27m24m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue0m
> +>0m38;2;0;204;0mt38;2;204;0;0mr38;2;0;204;0mue
>
>    zpty_start
>    zpty_input 'zmodload zsh/nearcolor'
> @@ -194,7 +194,7 @@
>    zpty_line 1 p       # the line of interest, preserving escapes ("p")
>    zpty_stop
>  0:overlapping region_highlight with near-color (hex-triplets at input)
> ->0m27m24mCDE|340|tCDE|3160|rCDE|340|ue0m
> +>0mCDE|340|tCDE|3160|rCDE|340|ue
>
>    zpty_start
>    zpty_input 'f () { zle clear-screen; zle g -f nolast; BUFFER=":
> ${(q)LASTWIDGET}" }; zle -N f'
> @@ -205,7 +205,7 @@
>    zpty_line 1 p
>    zpty_stop
>  0:zle $widgetname -f nolast
> ->0m27m24m0m27m24m: clear-screen
> +>0m0m: clear-screen
>
>  %clean
>
>

[-- Attachment #2: Type: text/html, Size: 4618 bytes --]