Module Name: src
Committed By: blymn
Date: Tue Jun 11 08:09:36 UTC 2019
Modified Files:
src/tests/lib/libcurses: t_curses.sh
src/tests/lib/libcurses/check_files: dupwin1.chk dupwin2.chk
src/tests/lib/libcurses/tests: dupwin fill_window_numbers
Log Message:
Fix dupwin test.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libcurses/t_curses.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/dupwin1.chk \
src/tests/lib/libcurses/check_files/dupwin2.chk
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/dupwin \
src/tests/lib/libcurses/tests/fill_window_numbers
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/t_curses.sh
diff -u src/tests/lib/libcurses/t_curses.sh:1.11 src/tests/lib/libcurses/t_curses.sh:1.12
--- src/tests/lib/libcurses/t_curses.sh:1.11 Tue Jun 11 08:00:38 2019
+++ src/tests/lib/libcurses/t_curses.sh Tue Jun 11 08:09:35 2019
@@ -765,7 +765,7 @@ atf_init_test_cases()
# atf_add_test_case delay_output # not working
atf_add_test_case derwin
atf_add_test_case doupdate
-# atf_add_test_case dupwin # not working
+ atf_add_test_case dupwin
atf_add_test_case erasechar
atf_add_test_case flash
atf_add_test_case getattrs
Index: src/tests/lib/libcurses/check_files/dupwin1.chk
diff -u src/tests/lib/libcurses/check_files/dupwin1.chk:1.1 src/tests/lib/libcurses/check_files/dupwin1.chk:1.2
--- src/tests/lib/libcurses/check_files/dupwin1.chk:1.1 Sun May 26 09:54:33 2019
+++ src/tests/lib/libcurses/check_files/dupwin1.chk Tue Jun 11 08:09:36 2019
@@ -3,4 +3,4 @@
333333
444444
555555
- 666666cup8;11Xcup9;13X111111cup10;13X222222cup11;13X333333cup12;13X444444cup13;13X555555cup14;13X666666cup14;18X
+ 666666 cup9;13X111111cup10;13X222222cup11;13X333333cup12;13X444444cup13;13X555555cup14;13X666666cup14;13X
\ No newline at end of file
Index: src/tests/lib/libcurses/check_files/dupwin2.chk
diff -u src/tests/lib/libcurses/check_files/dupwin2.chk:1.1 src/tests/lib/libcurses/check_files/dupwin2.chk:1.2
--- src/tests/lib/libcurses/check_files/dupwin2.chk:1.1 Sun May 26 09:54:33 2019
+++ src/tests/lib/libcurses/check_files/dupwin2.chk Tue Jun 11 08:09:36 2019
@@ -1 +1 @@
-cup8;11Xcup9;13Xaaaaaacup10;13Xbbbbbbcup11;13Xcccccccup12;13Xddddddcup13;13Xeeeeeecup14;13Xffffffcup14;18X
+cup8;6Xcup9;13Xaaaaaacup10;13Xbbbbbbcup11;13Xcccccccup12;13Xddddddcup13;13Xeeeeeecup14;13Xffffffcup14;13X
\ No newline at end of file
Index: src/tests/lib/libcurses/tests/dupwin
diff -u src/tests/lib/libcurses/tests/dupwin:1.1 src/tests/lib/libcurses/tests/dupwin:1.2
--- src/tests/lib/libcurses/tests/dupwin:1.1 Sun May 26 09:54:33 2019
+++ src/tests/lib/libcurses/tests/dupwin Tue Jun 11 08:09:36 2019
@@ -6,6 +6,11 @@ call OK mvwin $win2 8 12
call OK wrefresh $win1
call OK wrefresh $win2
compare dupwin1.chk
+call OK scrollok $win2 $TRUE
+call OK wmove $win2 5 0
+call OK waddstr $win2 "ffffff"
+call OK wmove $win2 4 0
+call OK wscrl $win2 -1
call OK wmove $win2 0 0
call OK waddstr $win2 "aaaaaa"
call OK wmove $win2 1 0
@@ -16,8 +21,6 @@ call OK wmove $win2 3 0
call OK waddstr $win2 "dddddd"
call OK wmove $win2 4 0
call OK waddstr $win2 "eeeeee"
-call OK wmove $win2 5 0
-call OK waddstr $win2 "ffffff"
call OK wrefresh $win1
call OK wrefresh $win2
compare dupwin2.chk
Index: src/tests/lib/libcurses/tests/fill_window_numbers
diff -u src/tests/lib/libcurses/tests/fill_window_numbers:1.1 src/tests/lib/libcurses/tests/fill_window_numbers:1.2
--- src/tests/lib/libcurses/tests/fill_window_numbers:1.1 Sun May 26 09:54:33 2019
+++ src/tests/lib/libcurses/tests/fill_window_numbers Tue Jun 11 08:09:36 2019
@@ -1,3 +1,8 @@
+call OK scrollok $win1 $TRUE
+call OK wmove $win1 5 0
+call OK waddstr $win1 "666666"
+call OK wmove $win1 4 0
+call OK wscrl $win1 -1
call OK wmove $win1 0 0
call OK waddstr $win1 "111111"
call OK wmove $win1 1 0
@@ -8,5 +13,3 @@ call OK wmove $win1 3 0
call OK waddstr $win1 "444444"
call OK wmove $win1 4 0
call OK waddstr $win1 "555555"
-call OK wmove $win1 5 0
-call OK waddstr $win1 "666666"
