Cherrypick shell1.test fix.

FossilOrigin-Name: 39e30c5f9cc6dcac003255734e3ce1ac5b05349ea1a25e1c108b5f6d1d97612b

diff --git a/manifest b/manifest
index 4d3bb6ee32501020a4298669efd0bb1aafca0e63..6c8f8636c9fa90a61de64047f083496daeb9c813 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplify\sand\smake\smore\srational\show\sconsole\sI/O\spackage\sfeatures\sare\sselected.\s(Motivated\sby\sFiddle\sand\sother\scommand-line\sutilities\sto\ssoon\suse\sthe\spackage.)\sNo\ssubstantive\scode-execution\schanges.
-D 2023-11-16T18:31:05.379
+C Cherrypick\sshell1.test\sfix.
+D 2023-11-20T00:20:56.905
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1566,7 +1566,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21
 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test 2191c892d8256b1b6cccb4fca894cfc2e748450cf422e6ec80a320a0d538b6df
+F test/shell1.test 0bb36232873d7df2ba627ed25cff1332f6d98c0f7f244b425702c1ab1850bd15
 F test/shell2.test 35226c070a8c7f64fd016dfac2a0db2a40f709b3131f61daacd9dad61536c9cb
 F test/shell3.test 91febeac0412812bf6370abb8ed72700e32bf8f9878849414518f662dfd55e8a
 F test/shell4.test 9abd0c12a7e20a4c49e84d5be208d2124fa6c09e728f56f1f4bee0f02853935f
@@ -2142,10 +2142,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2341f9b6a48634a94e90e849f579afd07d398c3e0304efccf07d18b41a0e40aa
-Q +45b8061e7568ccca164fe000f1f0a0d984b1c28fad530bc9fdea35793a0f40bc
-Q +957ebaa2be3056371d679f7a00aeba242db34218fb839ffd1d1197cad0c4a510
-R dab16a36061bd95f615790a1ad678bef
+P 1cde05877b7e47cb2ab9de26edd5245eb5ff1d91e69b94f3b24944fd4f6ccd3e
+Q +aaa73400c41f382bbbd4ea32ad196d271c7a5e800bfee9afd998037a14fc89b9
+R eaecfb623251eb332d80f340470747cf
 U larrybr
-Z f345bc7daef2ffd72adafc6ced1c0785
+Z 74a79fdeb1bf75d668bd72604f628ab5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 47eb0416b648008772c38f99ae986ad26aafaff0..f267e543a2a37e3988dfc22c955ca6fd2648bcc1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1cde05877b7e47cb2ab9de26edd5245eb5ff1d91e69b94f3b24944fd4f6ccd3e
\ No newline at end of file
+39e30c5f9cc6dcac003255734e3ce1ac5b05349ea1a25e1c108b5f6d1d97612b
\ No newline at end of file

diff --git a/test/shell1.test b/test/shell1.test
index 19848549ac148ca5aa7fb90836acac7be3d9db78..fb42e45cf5611124faadd9e308c9d83e1606d7b5 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -1067,7 +1067,7 @@ do_test shell1-5.0 {
       #
       set escapes [list \
           \a \\a \b \\b \t \\t \n \\n \v \\v \f \\f \r \\r \
-          " " "\" \"" \" \\\" ' \"'\" \\ \\\\]
+          " " "\" \"" \" \\\" \\ \\\\]
     } else {
       #
       # NOTE: On Unix, we need to escape most of the whitespace characters