Add comments and improve the new test case.

FossilOrigin-Name: 4ec2aeadf949028956e20b72999e2e9cad451922

diff --git a/manifest b/manifest
index c2375d740ae835013ff562494b0cb033b2028584..1b0d7afa289bbd7af05d656b2c0356d970579bbc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sshell\sfunction\sthat\sis\snow\ssuperfluous.
-D 2015-01-19T20:22:33.935
+C Add\scomments\sand\simprove\sthe\snew\stest\scase.
+D 2015-01-19T21:11:31.645
 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 6f7613e961c7ec72a1a926a3b2f23bea4a788a4d
+F test/shell1.test b6fb0b96577aaa60e8e8e768abf4d5949c190a89
 F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862
 F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29
 F test/shell4.test 8a9c08976291e6c6c808b4d718f4a8b299f339f5
@@ -1236,7 +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 d9f4035b381dcf8d3c96c42017ce28ef66201933
-R 4d1b1f8bcff8ce493a9009a139a1f217
+P d8564f70e6ba1e7c485d6b9a6a6cd81c43b41c98
+R b1db4ca4c048652a4b7c803dd82c6af9
 U mistachkin
-Z 498ff66fe60eb7a6487f38007cbf007b
+Z 534fb2c8d4e80bb2e75da2dbf7e3fa0b

diff --git a/manifest.uuid b/manifest.uuid
index 1037d6e32a423db0be85230e5298cc03af60ca0a..7254cba29964c8f0c65c83e64833d60875d65341 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d8564f70e6ba1e7c485d6b9a6a6cd81c43b41c98
\ No newline at end of file
+4ec2aeadf949028956e20b72999e2e9cad451922
\ No newline at end of file

diff --git a/test/shell1.test b/test/shell1.test
index 1562ac13989c81798f02d0466ecd8dd8216bc428..c858df208d3b50055cfc6572d1085226b9086a81 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -834,9 +834,32 @@ do_test shell1-5.0 {
     }
     set hex [format %02X $i]
     set char [subst \\x$hex]; set oldChar $char
-    set char [string map [list \
-        \a \\a \b \\b \t \\t \n \\n \v \\v \f \\f \r \\r \
-        " " "\" \"" \" \\\" ' \"'\" \\ \\\\] $char]
+    set escapes [list]
+    if {$tcl_platform(platform)=="windows"} {
+      #
+      # NOTE: On Windows, we need to escape all the whitespace characters,
+      #       the alarm (\a) character, and those with special meaning to
+      #       the SQLite shell itself.
+      #
+      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
+      #       and those with special meaning to the SQLite shell itself.
+      #       The alarm (\a), backspace (\b), and carriage-return (\r)
+      #       characters do not appear to require escaping on Unix.  For
+      #       the alarm and backspace characters, this is probably due to
+      #       differences in the command shell.  For the carriage-return,
+      #       it is probably due to differences in how Tcl handles command
+      #       channel end-of-line translations.
+      #
+      set escapes [list \
+          \t \\t \n \\n \v \\v \f \\f \
+          " " "\" \"" \" \\\" ' \"'\" \\ \\\\]
+    }
+    set char [string map $escapes $char]
     set x [catchcmdex test.db ".print $char\r\n"]
     set code [lindex $x 0]
     set res [lindex $x 1]