Minor changes to shell1.test test results to account for the new feature

of the shell that points to the specific part of the input line where the
error occurs.

FossilOrigin-Name: d4870c08893ea9984b1fa1c3a7d04893ad5ed4a2130e9287d169a306cc8ef0a4

diff --git a/manifest b/manifest
index d0b37a0071fe1bf1d490cceb60a377fe69575dfe..f40bc439fcfd1240385b8b914921aaf9fba013ac 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\saffinity\sof\scolumns\sis\shonored\sin\sthe\sRETURNING\sclause.\nSee\s[forum:/forumpost/e0c7574ab2|forum\spost\se0c7574ab2]\sfor\sthe\sbug\sreport.
-D 2021-12-29T04:31:54.399
+C Minor\schanges\sto\sshell1.test\stest\sresults\sto\saccount\sfor\sthe\snew\sfeature\nof\sthe\sshell\sthat\spoints\sto\sthe\sspecific\spart\sof\sthe\sinput\sline\swhere\sthe\nerror\soccurs.
+D 2021-12-29T13:32:36.797
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1380,7 +1380,7 @@ F test/sharedA.test 49d87ec54ab640fbbc3786ee3c01de94aaa482a3a9f834ad3fe92770eb69
 F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test c354008b27c904f0166c2138abd7382013ea070b41114114ecbdfb32c726a807
+F test/shell1.test e6c8fb4b710f29239392876c72ecc5a7f1d5d23e1f23838e5a6a2ccc9903d74f
 F test/shell2.test f00a0501c00583cbc46f7510e1d713366326b2b3e63d06d15937284171a8787c
 F test/shell3.test cb4b835a901742c9719437a89171172ecc4a8823ad97349af8e4e841e6f82566
 F test/shell4.test 3ed6c4b42fd695efcbc25d69ef759dbb15855ca8e52ba6c5ee076f8b435f48be
@@ -1934,8 +1934,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 416602a85101c2cd1705eb5306a8933e54cb05ae1562400395ec2769173dec01
-R f4950d8eb5e68670553d3ef4a059c1eb
+P 4711fb69547f4f17653ab116030c32fdcc2c836410349d1d025866ffc15704da
+R 5c3dff46ade5dadb3b517884aaa3c5ff
 U drh
-Z dbbd31fc9de5d8d6d989728469f60373
+Z 1ae7e3c1e437bcf89c5150a79373950f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b68b8c8374015f2bb55c374271e16b2413249e9e..40568e1ed461d9d42fff5be8109ccef08778605c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4711fb69547f4f17653ab116030c32fdcc2c836410349d1d025866ffc15704da
\ No newline at end of file
+d4870c08893ea9984b1fa1c3a7d04893ad5ed4a2130e9287d169a306cc8ef0a4
\ No newline at end of file

diff --git a/test/shell1.test b/test/shell1.test
index c4e2ceb88b01e254e1296fc3fda755f9e27a0093..17d34c3ed15100a5be2b2dab4e340ef2ea387ed5 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -53,7 +53,7 @@ do_test shell1-1.1.2 {
 # error on extra options
 do_test shell1-1.1.3 {
   catchcmd "test.db FOO test.db BAD" ".quit"
-} {1 {Error: in prepare, near "FOO": syntax error (1)}}
+} {/1 .Error: in prepare, near "FOO": syntax error (1)*/}
 
 # -help
 do_test shell1-1.2.1 {
@@ -78,7 +78,7 @@ do_test shell1-1.3.2 {
 } {0 {}}
 do_test shell1-1.3.3 {
   catchcmd "-init FOO test.db BAD .quit" ""
-} {1 {Error: in prepare, near "BAD": syntax error (1)}}
+} {/1 .Error: in prepare, near "BAD": syntax error (1)*/}
 
 # -echo                print commands before execution
 do_test shell1-1.4.1 {