Correct two tests in shell1.test which were broken by the addition of new output...

FossilOrigin-Name: 909dd0a02a967baef46c3efdca42a0ab4e15003e34ce7e9af82fce5f17213d7b

diff --git a/manifest b/manifest
index c21a71bcb84d7acd7348d6f48c0297d8bb45117c..0254997dacbdeccb647541e74e01753492985197 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C CLI\sshell:\smake\s(.output\soff)\san\salias\sfor\s(.output\s/dev/null)\sor\s(.output\snul),\sdepending\son\sthe\splatform.\sDiscussed\sin\s[forum:633979ce307f1cc6|forum\spost\s633979ce307f1cc6].
-D 2025-03-28T15:36:49.069
+C Correct\stwo\stests\sin\sshell1.test\swhich\swere\sbroken\sby\sthe\saddition\sof\snew\soutput\sin\s[0f11087b8475].
+D 2025-03-28T16:31:54.289
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -1642,7 +1642,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 1467ef88c498a1002b47028c304ad55511e5bdfed9db23d25628b2bd483e1026
+F test/shell1.test d41257103cf762e1d43f1d07286ac65ed32c5430a19851029bfe06671f5e19fe
 F test/shell2.test ac102ebc0a9ec166257600c4ee8bdefec242163afced295f10b004f4af3fc9dd
 F test/shell3.test 603b448e917537cf77be0f265c05c6f63bc677c63a533c8e96aae923b56f4a0e
 F test/shell4.test ad7eee983b5e7f1dd92d8c87bc0f39474086bc32c980c00f3934c54aabc636a2
@@ -2216,8 +2216,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P dbcc03bd7a727f4643f18a814bb9fd9071c0355f98dd064286240f2af361ee7f
-R fd12f331319e6fbbfa3b284204829987
+P 0f11087b84753576425823e10a7eeff45af02f3c0135dee72dec5019c8127500
+R 082a492a8f98df0cde4bf61b34507534
 U stephan
-Z 41a98a24cb0e972787f7e1497beff5d6
+Z ce71ee2295dd33b341b0035e7f01938b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c83cc1ec78ce705b9fba25241b6ef7d3ba3e986c..d654dc0d935f2bae6b2c3843fe853e08a8cc96b0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f11087b84753576425823e10a7eeff45af02f3c0135dee72dec5019c8127500
+909dd0a02a967baef46c3efdca42a0ab4e15003e34ce7e9af82fce5f17213d7b

diff --git a/test/shell1.test b/test/shell1.test
index 0e674a8497038f82447a3c0d99076c49babe9984..8cf11b240952b7523e977b164e2e6b9e6821b4b3 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -515,6 +515,7 @@ do_test shell1-3.15.3 {
 } {1 {ERROR: extra parameter: "BAD".  Usage:
 .output ?FILE?           Send output to FILE or stdout if FILE is omitted
    If FILE begins with '|' then open it as a pipe.
+   If FILE is 'off' then output is disabled.
    Options:
      --bom                 Prefix output with a UTF8 byte-order mark
      -e                    Send output to the system text editor
@@ -533,6 +534,7 @@ do_test shell1-3.16.2 {
 } {1 {ERROR: extra parameter: "BAD".  Usage:
 .output ?FILE?           Send output to FILE or stdout if FILE is omitted
    If FILE begins with '|' then open it as a pipe.
+   If FILE is 'off' then output is disabled.
    Options:
      --bom                 Prefix output with a UTF8 byte-order mark
      -e                    Send output to the system text editor