Module Name: src
Committed By: blymn
Date: Thu Nov 10 06:13:29 UTC 2022
Modified Files:
src/tests/lib/libcurses/check_files: Makefile waddstr.chk
src/tests/lib/libcurses/tests: waddstr
Added Files:
src/tests/lib/libcurses/check_files: waddstr2.chk
Log Message:
Uncomment the waddstr call that was returning ERR, this is actually
correct so make the expected return ERR then repeat the call with
scrollok set to true to validate.
Do refreshes on the window instead of stdscr so we get the window
contents reported and update the check files with the expected
output.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libcurses/check_files/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/waddstr.chk
cvs rdiff -u -r0 -r1.1 src/tests/lib/libcurses/check_files/waddstr2.chk
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/waddstr
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/Makefile
diff -u src/tests/lib/libcurses/check_files/Makefile:1.11 src/tests/lib/libcurses/check_files/Makefile:1.12
--- src/tests/lib/libcurses/check_files/Makefile:1.11 Tue Nov 8 06:06:54 2022
+++ src/tests/lib/libcurses/check_files/Makefile Thu Nov 10 06:13:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/11/08 06:06:54 blymn Exp $
+# $NetBSD: Makefile,v 1.12 2022/11/10 06:13:29 blymn Exp $
NOMAN= # defined
@@ -241,6 +241,7 @@ FILES+= waddchstr.chk
FILES+= waddnwstr1.chk
FILES+= waddnwstr2.chk
FILES+= waddstr.chk
+FILES+= waddstr2.chk
FILES+= waddwstr1.chk
FILES+= waddwstr2.chk
FILES+= waddwstr3.chk
Index: src/tests/lib/libcurses/check_files/waddstr.chk
diff -u src/tests/lib/libcurses/check_files/waddstr.chk:1.1 src/tests/lib/libcurses/check_files/waddstr.chk:1.2
--- src/tests/lib/libcurses/check_files/waddstr.chk:1.1 Sun Feb 7 01:53:54 2021
+++ src/tests/lib/libcurses/check_files/waddstr.chk Thu Nov 10 06:13:29 2022
@@ -1 +1,3 @@
-home
\ No newline at end of file
+abcdecup6;8X8
+ 012345
+ 6 8
\ No newline at end of file
Index: src/tests/lib/libcurses/tests/waddstr
diff -u src/tests/lib/libcurses/tests/waddstr:1.2 src/tests/lib/libcurses/tests/waddstr:1.3
--- src/tests/lib/libcurses/tests/waddstr:1.2 Sun Feb 7 01:53:54 2021
+++ src/tests/lib/libcurses/tests/waddstr Thu Nov 10 06:13:29 2022
@@ -2,8 +2,12 @@ include window
call OK waddstr $win1 "abcde\n"
call OK waddstr $win1 "\n"
call OK waddstr $win1 "\t8\n"
-# XXX: The following line causes an unexpected "ERR Resource temporarily
-# unavailable" on NetBSD/amd64 9.99.80.
-#call OK waddstr $win1 "0123456\t8\n"
-call OK refresh
+# The following should ERR because it will try to scroll but
+# scrollok is false
+call ERR waddstr $win1 "0123456\t8\n"
+call OK wrefresh $win1
compare waddstr.chk
+call OK scrollok $win1 $TRUE
+call OK waddstr $win1 "0123456\t8\n"
+call OK wrefresh $win1
+compare waddstr2.chk
Added files:
Index: src/tests/lib/libcurses/check_files/waddstr2.chk
diff -u /dev/null src/tests/lib/libcurses/check_files/waddstr2.chk:1.1
--- /dev/null Thu Nov 10 06:13:29 2022
+++ src/tests/lib/libcurses/check_files/waddstr2.chk Thu Nov 10 06:13:29 2022
@@ -0,0 +1,3 @@
+012345cup5;6X6cup6;8Xel
+ 8el
+ el
\ No newline at end of file
