Module Name: src
Committed By: blymn
Date: Sun May 26 07:28:15 UTC 2019
Modified Files:
src/tests/lib/libcurses/check_files: copywin10.chk copywin11.chk
copywin12.chk copywin13.chk copywin14.chk copywin2.chk copywin5.chk
copywin6.chk copywin7.chk copywin8.chk copywin9.chk
src/tests/lib/libcurses/tests: copywin
Log Message:
Adjust copywin test to work correctly with updated curses.
This fixes PR 54231
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/check_files/copywin10.chk \
src/tests/lib/libcurses/check_files/copywin11.chk \
src/tests/lib/libcurses/check_files/copywin12.chk \
src/tests/lib/libcurses/check_files/copywin13.chk \
src/tests/lib/libcurses/check_files/copywin14.chk \
src/tests/lib/libcurses/check_files/copywin2.chk \
src/tests/lib/libcurses/check_files/copywin5.chk \
src/tests/lib/libcurses/check_files/copywin6.chk \
src/tests/lib/libcurses/check_files/copywin7.chk \
src/tests/lib/libcurses/check_files/copywin8.chk \
src/tests/lib/libcurses/check_files/copywin9.chk
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/copywin
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/copywin10.chk
diff -u src/tests/lib/libcurses/check_files/copywin10.chk:1.2 src/tests/lib/libcurses/check_files/copywin10.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin10.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin10.chk Sun May 26 07:28:14 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin11.chk
diff -u src/tests/lib/libcurses/check_files/copywin11.chk:1.2 src/tests/lib/libcurses/check_files/copywin11.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin11.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin11.chk Sun May 26 07:28:14 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin12.chk
diff -u src/tests/lib/libcurses/check_files/copywin12.chk:1.2 src/tests/lib/libcurses/check_files/copywin12.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin12.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin12.chk Sun May 26 07:28:14 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin13.chk
diff -u src/tests/lib/libcurses/check_files/copywin13.chk:1.2 src/tests/lib/libcurses/check_files/copywin13.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin13.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin13.chk Sun May 26 07:28:14 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin14.chk
diff -u src/tests/lib/libcurses/check_files/copywin14.chk:1.2 src/tests/lib/libcurses/check_files/copywin14.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin14.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin14.chk Sun May 26 07:28:14 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin2.chk
diff -u src/tests/lib/libcurses/check_files/copywin2.chk:1.2 src/tests/lib/libcurses/check_files/copywin2.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin2.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin2.chk Sun May 26 07:28:14 2019
@@ -3,4 +3,4 @@ cup3;6Xtestin
ngtest
ingtes
tingte
- stingtcup8;11X
\ No newline at end of file
+ stingt
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/copywin5.chk
diff -u src/tests/lib/libcurses/check_files/copywin5.chk:1.2 src/tests/lib/libcurses/check_files/copywin5.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin5.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin5.chk Sun May 26 07:28:14 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin6.chk
diff -u src/tests/lib/libcurses/check_files/copywin6.chk:1.2 src/tests/lib/libcurses/check_files/copywin6.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin6.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin6.chk Sun May 26 07:28:15 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin7.chk
diff -u src/tests/lib/libcurses/check_files/copywin7.chk:1.2 src/tests/lib/libcurses/check_files/copywin7.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin7.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin7.chk Sun May 26 07:28:15 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin8.chk
diff -u src/tests/lib/libcurses/check_files/copywin8.chk:1.2 src/tests/lib/libcurses/check_files/copywin8.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin8.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin8.chk Sun May 26 07:28:15 2019
@@ -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
Index: src/tests/lib/libcurses/check_files/copywin9.chk
diff -u src/tests/lib/libcurses/check_files/copywin9.chk:1.2 src/tests/lib/libcurses/check_files/copywin9.chk:1.3
--- src/tests/lib/libcurses/check_files/copywin9.chk:1.2 Fri Sep 16 08:05:28 2011
+++ src/tests/lib/libcurses/check_files/copywin9.chk Sun May 26 07:28:15 2019
@@ -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
Index: src/tests/lib/libcurses/tests/copywin
diff -u src/tests/lib/libcurses/tests/copywin:1.1 src/tests/lib/libcurses/tests/copywin:1.2
--- src/tests/lib/libcurses/tests/copywin:1.1 Sun Apr 10 09:55:10 2011
+++ src/tests/lib/libcurses/tests/copywin Sun May 26 07:28:15 2019
@@ -4,12 +4,16 @@ call win2 newwin 7 9 10 14
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 wclear $win2
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 wclear $win2
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 wclear $win2
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
