Update shell1.test tests to deal with backslash escaping in TCL on Windows-style

pathnames.

FossilOrigin-Name: 219a251e182bf43376fbc8ae1ce6f77f18a1b092

diff --git a/manifest b/manifest
index b02404a99f37134fb81a10f200d520e3ae235b0e..71c59993da3abf7614608864bb28d2b48c8163b7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\sthe\sshell3.test\smodule\sunder\smingw\sbecause\sof\smingw's\sdodgy\ncommand-line\sparsing.
-D 2016-03-25T20:10:20.882
+C Update\sshell1.test\stests\sto\sdeal\swith\sbackslash\sescaping\sin\sTCL\son\sWindows-style\npathnames.
+D 2016-03-26T13:26:35.335
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -1028,7 +1028,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 12d1774936facc17a889e0c31877670ef5526f8c
+F test/shell1.test 25de3bf73c2a24fd3f0240396a3719d8679fd156
 F test/shell2.test 2e7a32c9ee03c6398478637d72416d5b9ebd9777
 F test/shell3.test 1448cb715b8b5f139d96e0e4d3e94ae31fd0a713
 F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9
@@ -1459,7 +1459,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 183350fa7cc6a5ab8bd0a86cab231a6e4c915890
-R 9c42844e710d61bbe7fe13708d65edbf
+P a7c080a90a236fbc18b9a42b78dbed4dd8a25160
+R 4fb0bc40e02c2e4ca004a6ff507130b3
 U drh
-Z ea11cf0717b5526a95e62f1683bac7ce
+Z 2e9acf052ed53f3a7f143522bd4e6960

diff --git a/manifest.uuid b/manifest.uuid
index 7dafaa591037c6dc84df35ac97f7ce8c2c6c1cbb..37f54adfef24d55ede17d3db91bdfea6ada5a187 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7c080a90a236fbc18b9a42b78dbed4dd8a25160
\ No newline at end of file
+219a251e182bf43376fbc8ae1ce6f77f18a1b092
\ No newline at end of file

diff --git a/test/shell1.test b/test/shell1.test
index 87edc3c8168b9dca645fd7a4bfa3cd5a6ed108e7..44886b9f389740fae23031ef6ec3d22098895b65 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -276,11 +276,11 @@ do_test shell1-3.2.4 {
 # .databases             List names and files of attached databases
 do_test shell1-3.3.1 {
   catchcmd_collapse_space "-csv test.db" ".databases"
-} "/0.+main.+[string map {/ .} [string range [get_pwd] 0 10]].*/"
+} "/0.+main.+[string map {/ ".{1,2}"} [string range [get_pwd] 0 10]].*/"
 do_test shell1-3.3.2 {
   # extra arguments ignored
   catchcmd_collapse_space "test.db" ".databases BAD"
-} "/0.+main.+[string map {/ .} [string range [get_pwd] 0 10]].*/"
+} "/0.+main.+[string map {/ ".{1,2}"} [string range [get_pwd] 0 10]].*/"
 
 # .dump ?TABLE? ...      Dump the database in an SQL text format
 #                          If TABLE specified, only dump tables matching