Module Name: src
Committed By: blymn
Date: Wed Oct 19 06:10:44 UTC 2022
Modified Files:
src/tests/lib/libcurses/check_files: add_wch3.chk copywin10.chk
delch2.chk delch3.chk delch6.chk delch7.chk get_wstr.chk
getn_wstr.chk ins_wch2.chk ins_wch3.chk redrawwin2.chk
touchline2.chk wcolor_set.chk wget_wstr.chk wgetn_wstr.chk
wins_wch2.chk wins_wch3.chk wins_wstr4.chk wvline_set.chk
src/tests/lib/libcurses/tests: ins_wch
Log Message:
Updates to account for changes resulting from fixes to libcurses.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/add_wch3.chk \
src/tests/lib/libcurses/check_files/delch3.chk \
src/tests/lib/libcurses/check_files/get_wstr.chk \
src/tests/lib/libcurses/check_files/getn_wstr.chk \
src/tests/lib/libcurses/check_files/ins_wch2.chk \
src/tests/lib/libcurses/check_files/ins_wch3.chk \
src/tests/lib/libcurses/check_files/wcolor_set.chk \
src/tests/lib/libcurses/check_files/wget_wstr.chk \
src/tests/lib/libcurses/check_files/wgetn_wstr.chk \
src/tests/lib/libcurses/check_files/wins_wch2.chk \
src/tests/lib/libcurses/check_files/wvline_set.chk
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/check_files/copywin10.chk \
src/tests/lib/libcurses/check_files/wins_wch3.chk
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/delch2.chk \
src/tests/lib/libcurses/check_files/delch6.chk \
src/tests/lib/libcurses/check_files/delch7.chk \
src/tests/lib/libcurses/check_files/redrawwin2.chk \
src/tests/lib/libcurses/check_files/touchline2.chk \
src/tests/lib/libcurses/check_files/wins_wstr4.chk
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/ins_wch
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/check_files/add_wch3.chk
diff -u src/tests/lib/libcurses/check_files/add_wch3.chk:1.2 src/tests/lib/libcurses/check_files/add_wch3.chk:1.3
--- src/tests/lib/libcurses/check_files/add_wch3.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/add_wch3.chk Wed Oct 19 06:10:43 2022
@@ -1,2 +1,2 @@
smso㐁rmsohome
-㐁㐁
\ No newline at end of file
+㐁㐁㐁㐁
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/delch3.chk
diff -u src/tests/lib/libcurses/check_files/delch3.chk:1.2 src/tests/lib/libcurses/check_files/delch3.chk:1.3
--- src/tests/lib/libcurses/check_files/delch3.chk:1.2 Sat Oct 24 04:46:16 2020
+++ src/tests/lib/libcurses/check_files/delch3.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-stsmsotrmso tessmsotrmso tes
\ No newline at end of file
+stsmsotrmso tessmsotelrmso
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/get_wstr.chk
diff -u src/tests/lib/libcurses/check_files/get_wstr.chk:1.2 src/tests/lib/libcurses/check_files/get_wstr.chk:1.3
--- src/tests/lib/libcurses/check_files/get_wstr.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/get_wstr.chk Wed Oct 19 06:10:43 2022
@@ -1,6 +1,6 @@
㐁el
-a cup4;2Xab cup4;3X cup4;1Xc cup4;2Xcd cup4;3Xcde cup4;4Xcd cup4;3Xcdf cup4;4X
- a cup5;6X ab cup5;7X a cup5;6X ac cup5;7X acd cup5;8X acd cup5;9X acdO cup5;10X acdOD cup5;11Xsmkx
- a cup6;3X ab cup6;4X abc cup6;5Xel d cup6;3X
\ No newline at end of file
+aelabelelcelcdelcdeelcdelcdfel
+ ael abel ael acel acdel acdel acdOel acdODelsmkx
+ ael abel abcelel del
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/getn_wstr.chk
diff -u src/tests/lib/libcurses/check_files/getn_wstr.chk:1.2 src/tests/lib/libcurses/check_files/getn_wstr.chk:1.3
--- src/tests/lib/libcurses/check_files/getn_wstr.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/getn_wstr.chk Wed Oct 19 06:10:43 2022
@@ -1,6 +1,6 @@
㐁el
-a cup4;2Xab cup4;3X cup4;1Xc cup4;2Xcd cup4;3Xcde cup4;4Xcd cup4;3Xcdf cup4;4Xcdf cup4;4Xcdf cup4;4Xcdf cup4;4X
- a cup5;6X ab cup5;7X a cup5;6X ac cup5;7X acd cup5;8X acd cup5;9X acdO cup5;10X acdOD cup5;11Xsmkx
- a cup6;3X ab cup6;4X abc cup6;5Xel d cup6;3X
\ No newline at end of file
+aelabelelcelcdelcdeelcdelcdfelcdfelcdfelcdfel
+ ael abel ael acel acdel acdel acdOel acdODelsmkx
+ ael abel abcelel del
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/ins_wch2.chk
diff -u src/tests/lib/libcurses/check_files/ins_wch2.chk:1.2 src/tests/lib/libcurses/check_files/ins_wch2.chk:1.3
--- src/tests/lib/libcurses/check_files/ins_wch2.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/ins_wch2.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-cup11;76XAAAAcup11;11Xsmso㐁㐁cup11;78Xrmso cup11;11X
\ No newline at end of file
+cup11;76XAAAAcup11;11Xsmso㐁㐁cup11;76Xrmso Acup11;11Xsmso㐁cup11;80Xrmso cup11;11X
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/ins_wch3.chk
diff -u src/tests/lib/libcurses/check_files/ins_wch3.chk:1.2 src/tests/lib/libcurses/check_files/ins_wch3.chk:1.3
--- src/tests/lib/libcurses/check_files/ins_wch3.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/ins_wch3.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-cup11;78Xelcup11;76XsmulArmul
\ No newline at end of file
+cup11;76XsmulArmul
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/wcolor_set.chk
diff -u src/tests/lib/libcurses/check_files/wcolor_set.chk:1.2 src/tests/lib/libcurses/check_files/wcolor_set.chk:1.3
--- src/tests/lib/libcurses/check_files/wcolor_set.chk:1.2 Tue Apr 12 07:04:19 2022
+++ src/tests/lib/libcurses/check_files/wcolor_set.chk Wed Oct 19 06:10:43 2022
@@ -1,4 +1,4 @@
-cup3;6Xsetaf1Xsetab2Xtestsetaf7Xsetab0X
+cup3;6Xsetaf1Xsetab2Xtestsetaf7Xsetab0Xel
el
el
el
Index: src/tests/lib/libcurses/check_files/wget_wstr.chk
diff -u src/tests/lib/libcurses/check_files/wget_wstr.chk:1.2 src/tests/lib/libcurses/check_files/wget_wstr.chk:1.3
--- src/tests/lib/libcurses/check_files/wget_wstr.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/wget_wstr.chk Wed Oct 19 06:10:43 2022
@@ -1,3 +1,3 @@
cup5;6X 㐁el
- a cup6;7X ab cup6;8X elc cup6;7X cd cup6;8X cde cup6;9X cd cup6;8X cdf cup6;9X
- a cup7;7X ab cup7;8X a cup7;7X ac cup7;8X ac cup7;9X acO cup7;10X acOD cup7;11Xsmkxcup8;7X a cup8;8X ab cup8;9X abc cup8;10X el d cup8;8X
\ No newline at end of file
+ ael abel elcel cdel cdeel cdel cdfel
+ ael abel ael acel acel acOel acODelsmkxcup8;7X ael abel abcel el del
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/wgetn_wstr.chk
diff -u src/tests/lib/libcurses/check_files/wgetn_wstr.chk:1.2 src/tests/lib/libcurses/check_files/wgetn_wstr.chk:1.3
--- src/tests/lib/libcurses/check_files/wgetn_wstr.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/wgetn_wstr.chk Wed Oct 19 06:10:43 2022
@@ -1,3 +1,3 @@
cup5;6X 㐁el
- a cup6;7X ab cup6;8X elc cup6;7X cd cup6;8X cde cup6;9X cd cup6;8X cdf cup6;9X cdf cup6;9X cdf cup6;9X cdf cup6;9X
- a cup7;7X ab cup7;8X a cup7;7X ac cup7;8X ac cup7;9X acO cup7;10X acOD cup7;11Xsmkxcup8;7X a cup8;8X ab cup8;9X abc cup8;10X el d cup8;8X
\ No newline at end of file
+ ael abel elcel cdel cdeel cdel cdfel cdfel cdfel cdfel
+ ael abel ael acel acel acOel acODelsmkxcup8;7X ael abel abcel el del
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/wins_wch2.chk
diff -u src/tests/lib/libcurses/check_files/wins_wch2.chk:1.2 src/tests/lib/libcurses/check_files/wins_wch2.chk:1.3
--- src/tests/lib/libcurses/check_files/wins_wch2.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/wins_wch2.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-cup5;9XAAcup5;7Xsmso㐁rmso cup5;7X
\ No newline at end of file
+cup5;9XAAcup5;7Xsmso㐁rmso Acup5;7X
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/wvline_set.chk
diff -u src/tests/lib/libcurses/check_files/wvline_set.chk:1.2 src/tests/lib/libcurses/check_files/wvline_set.chk:1.3
--- src/tests/lib/libcurses/check_files/wvline_set.chk:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/check_files/wvline_set.chk Wed Oct 19 06:10:43 2022
@@ -3,4 +3,4 @@
㐁
㐁
㐁
-㐁cup4;6Xrmsocup5;8Xsmso㐁cup6;8X㐁cup7;8X㐁cup5;8Xrmsosmso㐁cup5;8X㐁㐁cup3;11Xrmso
\ No newline at end of file
+㐁cup4;6Xrmsocup5;8Xsmso㐁cup6;8X㐁cup7;8X㐁cup5;8Xrmso
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/copywin10.chk
diff -u src/tests/lib/libcurses/check_files/copywin10.chk:1.3 src/tests/lib/libcurses/check_files/copywin10.chk:1.4
--- src/tests/lib/libcurses/check_files/copywin10.chk:1.3 Sun May 26 07:28:14 2019
+++ src/tests/lib/libcurses/check_files/copywin10.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-cup11;15Xt s i cup12;15Xg e t cup13;15Xn t s cup14;15X n t scup15;15Xt n t cup16;16Xt n t
\ No newline at end of file
+cup11;15Xt s ielcup12;15Xg e telcup13;15Xn t selcup14;15X n t scup15;15Xt n telcup16;16Xt n t
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/wins_wch3.chk
diff -u src/tests/lib/libcurses/check_files/wins_wch3.chk:1.3 src/tests/lib/libcurses/check_files/wins_wch3.chk:1.4
--- src/tests/lib/libcurses/check_files/wins_wch3.chk:1.3 Tue Apr 12 07:04:19 2022
+++ src/tests/lib/libcurses/check_files/wins_wch3.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
- cup5;10XsmulArmul
\ No newline at end of file
+ elcup5;10XsmulArmul
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/delch2.chk
diff -u src/tests/lib/libcurses/check_files/delch2.chk:1.1 src/tests/lib/libcurses/check_files/delch2.chk:1.2
--- src/tests/lib/libcurses/check_files/delch2.chk:1.1 Sun May 26 09:54:33 2019
+++ src/tests/lib/libcurses/check_files/delch2.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
- test te
\ No newline at end of file
+ testel te
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/delch6.chk
diff -u src/tests/lib/libcurses/check_files/delch6.chk:1.1 src/tests/lib/libcurses/check_files/delch6.chk:1.2
--- src/tests/lib/libcurses/check_files/delch6.chk:1.1 Sat Oct 24 04:46:16 2020
+++ src/tests/lib/libcurses/check_files/delch6.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-cup4;9Xt cup4;9X
\ No newline at end of file
+cup4;9Xtelcup4;9X
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/delch7.chk
diff -u src/tests/lib/libcurses/check_files/delch7.chk:1.1 src/tests/lib/libcurses/check_files/delch7.chk:1.2
--- src/tests/lib/libcurses/check_files/delch7.chk:1.1 Sat Oct 24 04:46:16 2020
+++ src/tests/lib/libcurses/check_files/delch7.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-tsmsotrmsocup4;9Xsmsotrmso cup4;9X
\ No newline at end of file
+tsmsotrmsocup4;9Xsmsotelcup4;9Xrmso
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/redrawwin2.chk
diff -u src/tests/lib/libcurses/check_files/redrawwin2.chk:1.1 src/tests/lib/libcurses/check_files/redrawwin2.chk:1.2
--- src/tests/lib/libcurses/check_files/redrawwin2.chk:1.1 Sat Oct 24 04:46:16 2020
+++ src/tests/lib/libcurses/check_files/redrawwin2.chk Wed Oct 19 06:10:43 2022
@@ -1 +1,24 @@
-homefoo cup2;1X cup3;1X bar cup4;1X cup5;1X cup6;1X cup7;1X cup8;1X cup9;1X cup10;1X cup11;1X cup12;1X
cup13;1X cup14;1X cup15;1X cup16;1X cup17;1X cup18;1X cup19;1X cup20;1X cup21;1X cup22;1X cup23;1X
cup24;1Xelcup3;14Xhome
\ No newline at end of file
+homefooelhome
+el
+ barel
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+el
+elcup3;14Xhome
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/touchline2.chk
diff -u src/tests/lib/libcurses/check_files/touchline2.chk:1.1 src/tests/lib/libcurses/check_files/touchline2.chk:1.2
--- src/tests/lib/libcurses/check_files/touchline2.chk:1.1 Sat Oct 24 04:46:16 2020
+++ src/tests/lib/libcurses/check_files/touchline2.chk Wed Oct 19 06:10:43 2022
@@ -1 +1,2 @@
-cup16;16Xaaaaaacup17;16Xbbbbbbcup18;16Xcccccccup19;16Xdddddd bbbbbb cup18;1X cccccc cup19;22X
\ No newline at end of file
+cup16;16Xaaaaaacup17;16Xbbbbbbcup18;16Xcccccccup19;16Xdddddd bbbbbbel
+ ccccccelcup19;22X
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/wins_wstr4.chk
diff -u src/tests/lib/libcurses/check_files/wins_wstr4.chk:1.1 src/tests/lib/libcurses/check_files/wins_wstr4.chk:1.2
--- src/tests/lib/libcurses/check_files/wins_wstr4.chk:1.1 Tue Nov 16 21:02:06 2021
+++ src/tests/lib/libcurses/check_files/wins_wstr4.chk Wed Oct 19 06:10:43 2022
@@ -1 +1 @@
-A㐁Acup5;7Xelcup6;7XAAcup7;7XD cup8;7X Ecup8;7X
\ No newline at end of file
+A㐁Acup5;7Xelcup6;7XAAcup7;7XDelcup8;7X Ecup8;7X
\ No newline at end of file
Index: src/tests/lib/libcurses/tests/ins_wch
diff -u src/tests/lib/libcurses/tests/ins_wch:1.2 src/tests/lib/libcurses/tests/ins_wch:1.3
--- src/tests/lib/libcurses/tests/ins_wch:1.2 Tue Jan 25 03:23:05 2022
+++ src/tests/lib/libcurses/tests/ins_wch Wed Oct 19 06:10:44 2022
@@ -11,13 +11,16 @@ call OK mvaddstr 10 75 "AAAA"
call OK refresh
# test shifting of above added characters, test do not wrap property
-# XXXX output is wrong - we add 2 2 column chars so no A's should be
-# XXXX left but ins_wch only spaces out 2 of them leaving 2 A's.
call OK move 10 10
+# these two inserts should result in one A at the end of the line
call OK ins_wch $ch1
call OK ins_wch $ch1
call OK refresh
call2 10 10 getyx STDSCR
+# This should push the last A off
+call OK ins_wch $ch1
+call OK refresh
+call2 10 10 getyx STDSCR
compare ins_wch2.chk
# test special character processing
