[src/trunk]: src/tests/lib/libcurses Adjust copywin test to work correctly wi...

[blymn <blymn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b0122f867a0
branches:  trunk
changeset: 451511:2b0122f867a0
user:      blymn <blymn%NetBSD.org@localhost>
date:      Sun May 26 07:28:14 2019 +0000

description:
Adjust copywin test to work correctly with updated curses.
This fixes PR 54231

diffstat:

 tests/lib/libcurses/check_files/copywin10.chk |   2 +-
 tests/lib/libcurses/check_files/copywin11.chk |   2 +-
 tests/lib/libcurses/check_files/copywin12.chk |   2 +-
 tests/lib/libcurses/check_files/copywin13.chk |   2 +-
 tests/lib/libcurses/check_files/copywin14.chk |   2 +-
 tests/lib/libcurses/check_files/copywin2.chk  |   2 +-
 tests/lib/libcurses/check_files/copywin5.chk  |   2 +-
 tests/lib/libcurses/check_files/copywin6.chk  |   6 ++----
 tests/lib/libcurses/check_files/copywin7.chk  |   6 ++----
 tests/lib/libcurses/check_files/copywin8.chk  |   2 +-
 tests/lib/libcurses/check_files/copywin9.chk  |   2 +-
 tests/lib/libcurses/tests/copywin             |  21 +++++++++++++++------
 12 files changed, 28 insertions(+), 23 deletions(-)

diffs (201 lines):

diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin10.chk
--- a/tests/lib/libcurses/check_files/copywin10.chk     Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin10.chk     Sun May 26 07:28:14 2019 +0000
@@ -1,1 +1,1 @@
-cup11;15Xt s i cup12;15Xg e t cup13;15Xn t s cup14;15X n t scup15;15Xt n t cup16;15X t n t
\ No newline at end of file
+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
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin11.chk
--- a/tests/lib/libcurses/check_files/copywin11.chk     Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin11.chk     Sun May 26 07:28:14 2019 +0000
@@ -1,4 +1,4 @@
 cup3;6Xel
      el
      elcup6;7Xel
-     elcup8;7Xelcup3;6Xcup11;15Xelcup12;15Xelcup13;15Xelcup14;16Xelcup15;15Xelcup16;16Xelcup11;15X
\ No newline at end of file
+     elcup8;7Xelcup3;6Xcup11;15Xelcup12;15Xelcup13;15Xelcup14;16Xelcup15;15Xelcup16;16Xelcup17;15Xel
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin12.chk
--- a/tests/lib/libcurses/check_files/copywin12.chk     Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin12.chk     Sun May 26 07:28:14 2019 +0000
@@ -1,4 +1,4 @@
 cup3;6Xt s i
      g e t
      n t scup6;7Xn t s
-     t n tcup8;7Xt n tcup8;11X
\ No newline at end of file
+     t n tcup8;7Xt n t
     
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin13.chk
--- a/tests/lib/libcurses/check_files/copywin13.chk     Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin13.chk     Sun May 26 07:28:14 2019 +0000
@@ -1,1 +1,1 @@
-cup11;16Xe t ncup12;16Xt s icup13;16Xg e tcup14;15Xi g ecup15;16Xi g ecup16;15Xs i g 
\ No newline at end of file
+cup11;16Xe t ncup12;16Xt s icup13;16Xg e tcup14;15Xi g ecup15;16Xi g ecup17;15Xs i ge
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin14.chk
--- a/tests/lib/libcurses/check_files/copywin14.chk     Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin14.chk     Sun May 26 07:28:14 2019 +0000
@@ -1,1 +1,1 @@
-cup11;15Xtesticup12;15Xgtestcup13;15Xngtescup14;16Xngtescup15;15Xtingtcup16;16Xtingt
\ No newline at end of file
+cup11;15Xtesticup12;15Xgtestcup13;15Xngtescup14;16Xngtescup15;15Xtingtcup16;16Xt n t
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin2.chk
--- a/tests/lib/libcurses/check_files/copywin2.chk      Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin2.chk      Sun May 26 07:28:14 2019 +0000
@@ -3,4 +3,4 @@
      ngtest
      ingtes
      tingte
-     stingtcup8;11X
\ No newline at end of file
+     stingt
     
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin5.chk
--- a/tests/lib/libcurses/check_files/copywin5.chk      Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin5.chk      Sun May 26 07:28:14 2019 +0000
@@ -1,1 +1,1 @@
-testingtecup12;15Xstingtestcup13;15Xingtestincup14;15Xgtestingtcup15;15Xestingtescup16;15Xtingtesticup16;23X
\ No newline at end of file
+testingtecup12;15Xstingtestcup13;15Xingtestincup14;15Xgtestingtcup15;15Xestingtescup17;15Xtingtesticup16;15X
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin6.chk
--- a/tests/lib/libcurses/check_files/copywin6.chk      Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin6.chk      Sun May 26 07:28:14 2019 +0000
@@ -1,6 +1,4 @@
-cup3;6Xtestin
-     stingt
+cup3;6Xstingt
      ingtes
      gtesti
-     esting
-     tingtecup8;11X
\ No newline at end of file
+     estingcup8;6X
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin7.chk
--- a/tests/lib/libcurses/check_files/copywin7.chk      Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin7.chk      Sun May 26 07:28:14 2019 +0000
@@ -1,6 +1,4 @@
-cup3;6Xel
+el
      el
      el
-     el
-     el
-     elcup11;15Xelcup12;15Xelcup13;15Xelcup14;15Xelcup15;15Xelcup16;15Xel
\ No newline at end of file
+     elcup11;15Xelcup12;15Xelcup13;15Xelcup14;15Xelcup15;15Xelcup17;15Xel
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin8.chk
--- a/tests/lib/libcurses/check_files/copywin8.chk      Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin8.chk      Sun May 26 07:28:14 2019 +0000
@@ -1,4 +1,4 @@
 cup3;6Xt s i
      g e t
      n t scup6;7Xn t s
-     t n tcup8;7Xt n tcup8;11X
\ No newline at end of file
+     t n tcup8;7Xt n t
     
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/check_files/copywin9.chk
--- a/tests/lib/libcurses/check_files/copywin9.chk      Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/check_files/copywin9.chk      Sun May 26 07:28:14 2019 +0000
@@ -1,1 +1,1 @@
-cup11;16Xe t ncup12;16Xt s icup13;16Xg e tcup14;15Xi g ecup15;16Xi g ecup16;15Xs i g 
\ No newline at end of file
+cup11;16Xe t ncup12;16Xt s icup13;16Xg e tcup14;15Xi g ecup15;16Xi g ecup17;15Xs i ge
\ No newline at end of file
diff -r d33c26c61ab6 -r 2b0122f867a0 tests/lib/libcurses/tests/copywin
--- a/tests/lib/libcurses/tests/copywin Sun May 26 06:18:13 2019 +0000
+++ b/tests/lib/libcurses/tests/copywin Sun May 26 07:28:14 2019 +0000
@@ -4,12 +4,16 @@
 check win2 NON_NULL
 call OK wrefresh $win2
 compare copywin1.chk
+call OK scrollok $win1 $TRUE
+call OK scrollok $win2 $TRUE
+call OK mvwprintw $win1 5 0 "%s" "stingt"
+call OK wmove $win1 4 0
+call OK wscrl $win1 -1
 call OK mvwprintw $win1 0 0 "%s" "testin"
 call OK mvwprintw $win1 1 0 "%s" "gtesti"
 call OK mvwprintw $win1 2 0 "%s" "ngtest"
 call OK mvwprintw $win1 3 0 "%s" "ingtes"
 call OK mvwprintw $win1 4 0 "%s" "tingte"
-call OK mvwprintw $win1 5 0 "%s" "stingt"
 call OK wrefresh $win1
 compare copywin2.chk
 call OK copywin $win1 $win2 0 0 1 1 7 7 0
@@ -20,12 +24,13 @@
 call OK wrefresh $win1
 call OK wrefresh $win2
 compare copywin4.chk
+call OK mvwprintw $win2 5 0 "%s" "tingtesti"
+call OK wscrl $win2 -1
 call OK mvwprintw $win2 0 0 "%s" "testingte"
 call OK mvwprintw $win2 1 0 "%s" "stingtest"
 call OK mvwprintw $win2 2 0 "%s" "ingtestin"
 call OK mvwprintw $win2 3 0 "%s" "gtestingt"
 call OK mvwprintw $win2 4 0 "%s" "estingtes"
-call OK mvwprintw $win2 5 0 "%s" "tingtesti"
 call OK wrefresh $win2
 compare copywin5.chk
 call OK copywin $win2 $win1 0 0 0 0 7 9 0
@@ -36,20 +41,22 @@
 call OK wrefresh $win1
 call OK wrefresh $win2
 compare copywin7.chk
+call OK mvwprintw $win1 5 0 "%s" " t n t"
+call OK wscrl $win1 -1
 call OK mvwprintw $win1 0 0 "%s" "t s i "
 call OK mvwprintw $win1 1 0 "%s" "g e t "
 call OK mvwprintw $win1 2 0 "%s" "n t s "
 call OK mvwprintw $win1 3 0 "%s" " n t s"
 call OK mvwprintw $win1 4 0 "%s" "t n t "
-call OK mvwprintw $win1 5 0 "%s" " t n t"
 call OK wrefresh $win1
 compare copywin8.chk
+call OK mvwprintw $win2 5 0 "%s" "s i g "
+call OK wscrl $win2 -1
 call OK mvwprintw $win2 0 0 "%s" " e t n"
 call OK mvwprintw $win2 1 0 "%s" " t s i"
 call OK mvwprintw $win2 2 0 "%s" " g e t"
 call OK mvwprintw $win2 3 0 "%s" "i g e "
 call OK mvwprintw $win2 4 0 "%s" " i g e"
-call OK mvwprintw $win2 5 0 "%s" "s i g "
 call OK wrefresh $win2
 compare copywin9.chk
 call OK copywin $win1 $win2 0 0 0 0 6 6 0
@@ -60,20 +67,22 @@
 call OK wrefresh $win1
 call OK wrefresh $win2
 compare copywin11.chk
+call OK mvwprintw $win1 5 0 "%s" " t n t"
+call OK wscrl $win1 -1
 call OK mvwprintw $win1 0 0 "%s" "t s i "
 call OK mvwprintw $win1 1 0 "%s" "g e t "
 call OK mvwprintw $win1 2 0 "%s" "n t s "
 call OK mvwprintw $win1 3 0 "%s" " n t s"
 call OK mvwprintw $win1 4 0 "%s" "t n t "
-call OK mvwprintw $win1 5 0 "%s" " t n t"
 call OK wrefresh $win1
 compare copywin12.chk
+call OK mvwprintw $win2 5 0 "%s" "s i g "
+call OK wscrl $win2 -1
 call OK mvwprintw $win2 0 0 "%s" " e t n"
 call OK mvwprintw $win2 1 0 "%s" " t s i"
 call OK mvwprintw $win2 2 0 "%s" " g e t"
 call OK mvwprintw $win2 3 0 "%s" "i g e "
 call OK mvwprintw $win2 4 0 "%s" " i g e"
-call OK mvwprintw $win2 5 0 "%s" "s i g "
 call OK wrefresh $win2
 compare copywin13.chk
 call OK copywin $win1 $win2 0 0 0 0 6 6 1