Modify the new shell test case to work on non-Windows platforms as well.

FossilOrigin-Name: f362c5d9d17a04404a0407a556202d101fde84ee

diff --git a/manifest b/manifest
index 0df44443174a1c1cd0738971b42b6f590a2d37a3..0e6bdc83949e8d3a41459d6f5dfd308e1fc0e230 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Some\sexperimental\scommand\sline\sshell\sinput/output\senhancements.
-D 2015-01-18T05:35:01.547
+C Modify\sthe\snew\sshell\stest\scase\sto\swork\son\snon-Windows\splatforms\sas\swell.
+D 2015-01-18T09:02:57.181
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5407a688f4d77a05c18a8142be8ae5a2829dd610
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -855,7 +855,7 @@ F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
 F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
 F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test 4c16272bc959443fe3848d1370e686694b10fdaf
+F test/shell1.test 6f7613e961c7ec72a1a926a3b2f23bea4a788a4d
 F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
 F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
 F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
@@ -1236,10 +1236,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 80541e8b94b713e8f9e588ae047ffc5ae804ef1c
-R b03241b729782f3438422b692742f278
-T *branch * expShell
-T *sym-expShell *
-T -sym-trunk *
+P 25e99f3fe5e4c90e92554b8ac6cd6a83a8d01a6a
+R 43870c62c1e65e8d20eddaf6282c1e54
 U mistachkin
-Z 971bfa7ec1c0dafc699fba1587f31a66
+Z 9565e92f8c2f373e24d28ccccb448894

diff --git a/manifest.uuid b/manifest.uuid
index 9a4c0dbb069178f5fb762e6c56b13c1b076c9565..f08ce1ec5d3695ba33d6ddf913242f17f033374a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-25e99f3fe5e4c90e92554b8ac6cd6a83a8d01a6a
\ No newline at end of file
+f362c5d9d17a04404a0407a556202d101fde84ee
\ No newline at end of file

diff --git a/test/shell1.test b/test/shell1.test
index 22fd6ce16f65e13204a806267c95667b3e143237..1562ac13989c81798f02d0466ecd8dd8216bc428 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -824,11 +824,12 @@ do_test shell1-5.0 {
   #
   for {set i 1} {$i < 256} {incr i} {
     #
-    # NOTE: Due to how the Tcl [exec] command works on Windows (i.e. where
-    #       it treats command channels opened for it as textual ones), the
-    #       carriage-return and end-of-file characters cannot be used here.
+    # NOTE: Due to how the Tcl [exec] command works (i.e. where it treats
+    #       command channels opened for it as textual ones), the carriage
+    #       return character (and on Windows, the end-of-file character)
+    #       cannot be used here.
     #
-    if {$tcl_platform(platform)=="windows" && ($i == 0x0D || $i == 0x1A)} {
+    if {$i==0x0D || ($tcl_platform(platform)=="windows" && $i==0x1A)} {
       continue
     }
     set hex [format %02X $i]