14 files changed, 20 insertions, 14 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index 87b5cac1..01c28bb5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2020-03-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* beginfile2.ok, funsmnam.ok, incdupe4.ok, incdupe5.ok, incdupe6.ok,
+	incdupe7.ok, lintold.ok, nofile.ok, nulinsrc.ok, paramasfunc1.ok,
+	paramasfunc2.ok, paramres.ok, space.ok: Update after code changes.
+
 2020-03-07         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* symtab11.awk, symtab11.ok: Add value of array elements
diff --git a/test/beginfile2.ok b/test/beginfile2.ok
index fed71bb2..86f91a03 100644
--- a/test/beginfile2.ok
+++ b/test/beginfile2.ok
@@ -6,7 +6,7 @@ In BEGINFILE: beginfile2.in
 In BEGIN
 In BEGINFILE: beginfile2.in
 In BEGINFILE: file/does/not/exist
-gawk: cmd. line:3: fatal: cannot open file `file/does/not/exist' for reading (No such file or directory)
+gawk: cmd. line:3: fatal: cannot open file `file/does/not/exist' for reading: No such file or directory
 --Test 2--
 In BEGINFILE: beginfile2.in
 In ENDFILE: beginfile2.in
diff --git a/test/funsmnam.ok b/test/funsmnam.ok
index cce0d275..6539204c 100644
--- a/test/funsmnam.ok
+++ b/test/funsmnam.ok
@@ -1,2 +1,2 @@
-gawk: funsmnam.awk:2: error: function `foo': can't use function name as parameter name
+gawk: funsmnam.awk:2: error: function `foo': cannot use function name as parameter name
 EXIT CODE: 1
diff --git a/test/incdupe4.ok b/test/incdupe4.ok
index a6fc26e2..403b75fe 100644
--- a/test/incdupe4.ok
+++ b/test/incdupe4.ok
@@ -1,2 +1,2 @@
-gawk: fatal: can't include `hello.awk' and use it as a program file
+gawk: fatal: cannot include `hello.awk' and use it as a program file
 EXIT CODE: 2
diff --git a/test/incdupe5.ok b/test/incdupe5.ok
index a6fc26e2..403b75fe 100644
--- a/test/incdupe5.ok
+++ b/test/incdupe5.ok
@@ -1,2 +1,2 @@
-gawk: fatal: can't include `hello.awk' and use it as a program file
+gawk: fatal: cannot include `hello.awk' and use it as a program file
 EXIT CODE: 2
diff --git a/test/incdupe6.ok b/test/incdupe6.ok
index 42a4f9fd..a3378295 100644
--- a/test/incdupe6.ok
+++ b/test/incdupe6.ok
@@ -1,3 +1,3 @@
 gawk: inchello:1: warning: `include' is a gawk extension
-gawk: inchello:2: fatal: can't include `hello' and use it as a program file
+gawk: inchello:2: fatal: cannot include `hello' and use it as a program file
 EXIT CODE: 2
diff --git a/test/incdupe7.ok b/test/incdupe7.ok
index 42a4f9fd..a3378295 100644
--- a/test/incdupe7.ok
+++ b/test/incdupe7.ok
@@ -1,3 +1,3 @@
 gawk: inchello:1: warning: `include' is a gawk extension
-gawk: inchello:2: fatal: can't include `hello' and use it as a program file
+gawk: inchello:2: fatal: cannot include `hello' and use it as a program file
 EXIT CODE: 2
diff --git a/test/lintold.ok b/test/lintold.ok
index e3867e4e..df60aad6 100644
--- a/test/lintold.ok
+++ b/test/lintold.ok
@@ -1,10 +1,10 @@
 gawk: lintold.awk:7: warning: `delete' is not supported in old awk
 gawk: lintold.awk:8: warning: old awk does not support the keyword `in' except after `for'
-gawk: lintold.awk:9: warning: old awk does not support operator `**='
+gawk: lintold.awk:9: warning: operator `**=' is not supported in old awk
 gawk: lintold.awk:10: warning: old awk does not support the keyword `in' except after `for'
 gawk: lintold.awk:10: warning: old awk does not support multidimensional arrays
 gawk: lintold.awk:11: warning: operator `^=' is not supported in old awk
-gawk: lintold.awk:11: warning: old awk does not support operator `**'
+gawk: lintold.awk:11: warning: operator `**' is not supported in old awk
 gawk: lintold.awk:11: warning: operator `^' is not supported in old awk
 gawk: lintold.awk:13: warning: old awk does not support multiple `BEGIN' or `END' rules
 gawk: lintold.awk:15: warning: old awk does not support the `\b' escape sequence
diff --git a/test/nofile.ok b/test/nofile.ok
index eff8c043..fd486f09 100644
--- a/test/nofile.ok
+++ b/test/nofile.ok
@@ -1,2 +1,2 @@
-gawk: fatal: cannot open file `no/such/file' for reading (No such file or directory)
+gawk: fatal: cannot open file `no/such/file' for reading: No such file or directory
 EXIT CODE: 2
diff --git a/test/nulinsrc.ok b/test/nulinsrc.ok
index 515f423c..e424ad1a 100644
--- a/test/nulinsrc.ok
+++ b/test/nulinsrc.ok
@@ -1,2 +1,2 @@
-gawk: nulinsrc.awk:1: fatal: PEBKAC error: invalid character '\000' in source code
+gawk: nulinsrc.awk:1: fatal: error: invalid character '\000' in source code
 EXIT CODE: 2
diff --git a/test/paramasfunc1.ok b/test/paramasfunc1.ok
index 9ee95116..bfde5157 100644
--- a/test/paramasfunc1.ok
+++ b/test/paramasfunc1.ok
@@ -1,3 +1,3 @@
 gawk: paramasfunc1.awk:6: error: attempt to use non-function `abc' in function call
-gawk: error: function `X': can't use function `abc' as a parameter name
+gawk: error: function `X': cannot use function `abc' as a parameter name
 EXIT CODE: 1
diff --git a/test/paramasfunc2.ok b/test/paramasfunc2.ok
index 2cdf4f66..c4ac75d9 100644
--- a/test/paramasfunc2.ok
+++ b/test/paramasfunc2.ok
@@ -1,3 +1,3 @@
 gawk: paramasfunc2.awk:8: error: attempt to use non-function `abc' in function call
-gawk: error: function `X': can't use function `abc' as a parameter name
+gawk: error: function `X': cannot use function `abc' as a parameter name
 EXIT CODE: 1
diff --git a/test/paramres.ok b/test/paramres.ok
index 0687f92d..0b6a2874 100644
--- a/test/paramres.ok
+++ b/test/paramres.ok
@@ -1,2 +1,2 @@
-gawk: paramres.awk:3: error: function `foo': can't use special variable `FS' as a function parameter
+gawk: paramres.awk:3: error: function `foo': cannot use special variable `FS' as a function parameter
 EXIT CODE: 1
diff --git a/test/space.ok b/test/space.ok
index 0f769564..9e9ef007 100644
--- a/test/space.ok
+++ b/test/space.ok
@@ -1,2 +1,2 @@
-gawk: fatal: can't open source file ` ' for reading (No such file or directory)
+gawk: fatal: cannot open source file ` ' for reading: No such file or directory
 EXIT CODE: 2