summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblymn <blymn@NetBSD.org>2022-10-19 06:10:43 +0000
committerblymn <blymn@NetBSD.org>2022-10-19 06:10:43 +0000
commit632661ce6f4d3c6c1974bc6085f7c67c2e05b481 (patch)
treed63255ff176a7f13ad046328044f14e553e5effe
parent33229d3e6c07b99d809b2e0a6d5edcf8644509bc (diff)
Updates to account for changes resulting from fixes to libcurses.
-rw-r--r--tests/lib/libcurses/check_files/add_wch3.chk2
-rw-r--r--tests/lib/libcurses/check_files/copywin10.chk2
-rw-r--r--tests/lib/libcurses/check_files/delch2.chk2
-rw-r--r--tests/lib/libcurses/check_files/delch3.chk2
-rw-r--r--tests/lib/libcurses/check_files/delch6.chk2
-rw-r--r--tests/lib/libcurses/check_files/delch7.chk2
-rw-r--r--tests/lib/libcurses/check_files/get_wstr.chk6
-rw-r--r--tests/lib/libcurses/check_files/getn_wstr.chk6
-rw-r--r--tests/lib/libcurses/check_files/ins_wch2.chk2
-rw-r--r--tests/lib/libcurses/check_files/ins_wch3.chk2
-rw-r--r--tests/lib/libcurses/check_files/redrawwin2.chk25
-rw-r--r--tests/lib/libcurses/check_files/touchline2.chk3
-rw-r--r--tests/lib/libcurses/check_files/wcolor_set.chk2
-rw-r--r--tests/lib/libcurses/check_files/wget_wstr.chk4
-rw-r--r--tests/lib/libcurses/check_files/wgetn_wstr.chk4
-rw-r--r--tests/lib/libcurses/check_files/wins_wch2.chk2
-rw-r--r--tests/lib/libcurses/check_files/wins_wch3.chk2
-rw-r--r--tests/lib/libcurses/check_files/wins_wstr4.chk2
-rw-r--r--tests/lib/libcurses/check_files/wvline_set.chk2
-rw-r--r--tests/lib/libcurses/tests/ins_wch7
20 files changed, 54 insertions, 27 deletions
diff --git a/tests/lib/libcurses/check_files/add_wch3.chk b/tests/lib/libcurses/check_files/add_wch3.chk
index cfcaa392d32..cf1e0ba94bc 100644
--- a/tests/lib/libcurses/check_files/add_wch3.chk
+++ b/tests/lib/libcurses/check_files/add_wch3.chk
@@ -1,2 +1,2 @@
smso㐁rmsohome
-㐁㐁  \ No newline at end of file
+㐁㐁 㐁㐁 \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/copywin10.chk b/tests/lib/libcurses/check_files/copywin10.chk
index 8fb789714a9..620065aed82 100644
--- a/tests/lib/libcurses/check_files/copywin10.chk
+++ b/tests/lib/libcurses/check_files/copywin10.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/delch2.chk b/tests/lib/libcurses/check_files/delch2.chk
index 2d325b2b019..8e9333c4690 100644
--- a/tests/lib/libcurses/check_files/delch2.chk
+++ b/tests/lib/libcurses/check_files/delch2.chk
@@ -1 +1 @@
- test te \ No newline at end of file
+ testel te \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/delch3.chk b/tests/lib/libcurses/check_files/delch3.chk
index 7d70974e0e7..a5743780a91 100644
--- a/tests/lib/libcurses/check_files/delch3.chk
+++ b/tests/lib/libcurses/check_files/delch3.chk
@@ -1 +1 @@
-stsmsotrmso tessmsotrmso tes \ No newline at end of file
+stsmsotrmso tessmsotel rmso \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/delch6.chk b/tests/lib/libcurses/check_files/delch6.chk
index b1b156f87c3..e2b4f27d2ec 100644
--- a/tests/lib/libcurses/check_files/delch6.chk
+++ b/tests/lib/libcurses/check_files/delch6.chk
@@ -1 +1 @@
-cup4;9Xt cup4;9X \ No newline at end of file
+cup4;9Xtelcup4;9X \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/delch7.chk b/tests/lib/libcurses/check_files/delch7.chk
index 49e9c6786f3..0ad0b5d1590 100644
--- a/tests/lib/libcurses/check_files/delch7.chk
+++ b/tests/lib/libcurses/check_files/delch7.chk
@@ -1 +1 @@
-tsmsotrmsocup4;9Xsmsotrmso cup4;9X \ No newline at end of file
+tsmsotrmsocup4;9Xsmsotelcup4;9Xrmso \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/get_wstr.chk b/tests/lib/libcurses/check_files/get_wstr.chk
index f01ea2da74c..3c22f294a05 100644
--- a/tests/lib/libcurses/check_files/get_wstr.chk
+++ b/tests/lib/libcurses/check_files/get_wstr.chk
@@ -1,6 +1,6 @@
㐁el
-a cup4;2X ab cup4;3X cup4;1Xc cup4;2X cd cup4;3X cde cup4;4X cd cup4;3X cdf 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;5X el d cup6;3X \ No newline at end of file
+ael abel elcel cdel cdeel cdel cdfel
+ ael abel ael acel acdel acdel acdOel acdODelsmkx
+ ael abel abcel el del \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/getn_wstr.chk b/tests/lib/libcurses/check_files/getn_wstr.chk
index 2de43eb01f4..25001551652 100644
--- a/tests/lib/libcurses/check_files/getn_wstr.chk
+++ b/tests/lib/libcurses/check_files/getn_wstr.chk
@@ -1,6 +1,6 @@
㐁el
-a cup4;2X ab cup4;3X cup4;1Xc cup4;2X cd cup4;3X cde cup4;4X cd cup4;3X cdf cup4;4X cdf cup4;4X cdf cup4;4X cdf 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;5X el d cup6;3X \ No newline at end of file
+ael abel elcel cdel cdeel cdel cdfel cdfel cdfel cdfel
+ ael abel ael acel acdel acdel acdOel acdODelsmkx
+ ael abel abcel el del \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/ins_wch2.chk b/tests/lib/libcurses/check_files/ins_wch2.chk
index 660fe4d44cd..121d51c591b 100644
--- a/tests/lib/libcurses/check_files/ins_wch2.chk
+++ b/tests/lib/libcurses/check_files/ins_wch2.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/ins_wch3.chk b/tests/lib/libcurses/check_files/ins_wch3.chk
index c3790d978e0..32c9eb630e8 100644
--- a/tests/lib/libcurses/check_files/ins_wch3.chk
+++ b/tests/lib/libcurses/check_files/ins_wch3.chk
@@ -1 +1 @@
-cup11;78Xelcup11;76XsmulArmul \ No newline at end of file
+cup11;76XsmulArmul \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/redrawwin2.chk b/tests/lib/libcurses/check_files/redrawwin2.chk
index 5efea368118..d2149557d63 100644
--- a/tests/lib/libcurses/check_files/redrawwin2.chk
+++ b/tests/lib/libcurses/check_files/redrawwin2.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/touchline2.chk b/tests/lib/libcurses/check_files/touchline2.chk
index 0c4d7eaa60c..aefea1f2451 100644
--- a/tests/lib/libcurses/check_files/touchline2.chk
+++ b/tests/lib/libcurses/check_files/touchline2.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/wcolor_set.chk b/tests/lib/libcurses/check_files/wcolor_set.chk
index e0d50963400..3d0588d849c 100644
--- a/tests/lib/libcurses/check_files/wcolor_set.chk
+++ b/tests/lib/libcurses/check_files/wcolor_set.chk
@@ -1,4 +1,4 @@
-cup3;6Xsetaf1Xsetab2Xtestsetaf7Xsetab0X
+cup3;6Xsetaf1Xsetab2Xtestsetaf7Xsetab0Xel
el
el
el
diff --git a/tests/lib/libcurses/check_files/wget_wstr.chk b/tests/lib/libcurses/check_files/wget_wstr.chk
index 8d545cd3a36..d176bd2c996 100644
--- a/tests/lib/libcurses/check_files/wget_wstr.chk
+++ b/tests/lib/libcurses/check_files/wget_wstr.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/wgetn_wstr.chk b/tests/lib/libcurses/check_files/wgetn_wstr.chk
index a01eb67d618..18398144c7e 100644
--- a/tests/lib/libcurses/check_files/wgetn_wstr.chk
+++ b/tests/lib/libcurses/check_files/wgetn_wstr.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/wins_wch2.chk b/tests/lib/libcurses/check_files/wins_wch2.chk
index 775e995fde8..c31680d22b1 100644
--- a/tests/lib/libcurses/check_files/wins_wch2.chk
+++ b/tests/lib/libcurses/check_files/wins_wch2.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/wins_wch3.chk b/tests/lib/libcurses/check_files/wins_wch3.chk
index 0482dc9e03b..8669838de07 100644
--- a/tests/lib/libcurses/check_files/wins_wch3.chk
+++ b/tests/lib/libcurses/check_files/wins_wch3.chk
@@ -1 +1 @@
- cup5;10XsmulArmul \ No newline at end of file
+ elcup5;10XsmulArmul \ No newline at end of file
diff --git a/tests/lib/libcurses/check_files/wins_wstr4.chk b/tests/lib/libcurses/check_files/wins_wstr4.chk
index da7cec1a047..19be5bf553f 100644
--- a/tests/lib/libcurses/check_files/wins_wstr4.chk
+++ b/tests/lib/libcurses/check_files/wins_wstr4.chk
@@ -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
diff --git a/tests/lib/libcurses/check_files/wvline_set.chk b/tests/lib/libcurses/check_files/wvline_set.chk
index c671e4e6da3..b2fd2ce2fdd 100644
--- a/tests/lib/libcurses/check_files/wvline_set.chk
+++ b/tests/lib/libcurses/check_files/wvline_set.chk
@@ -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
diff --git a/tests/lib/libcurses/tests/ins_wch b/tests/lib/libcurses/tests/ins_wch
index f4c605c7881..d9c0b3041be 100644
--- a/tests/lib/libcurses/tests/ins_wch
+++ b/tests/lib/libcurses/tests/ins_wch
@@ -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