Remove the catchcmd_collapse_space procedure in tester.tcl - no longer needed.

FossilOrigin-Name: 3bd499d3bdf4e80f83513966c2ee9dd11e67cbd1

diff --git a/manifest b/manifest
index 71c59993da3abf7614608864bb28d2b48c8163b7..a1183f549254df9ee4267a9c93793454d891d660 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sshell1.test\stests\sto\sdeal\swith\sbackslash\sescaping\sin\sTCL\son\sWindows-style\npathnames.
-D 2016-03-26T13:26:35.335
+C Remove\sthe\scatchcmd_collapse_space\sprocedure\sin\stester.tcl\s-\sno\slonger\sneeded.
+D 2016-03-26T14:41:13.450
 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 25de3bf73c2a24fd3f0240396a3719d8679fd156
+F test/shell1.test d36a68f0d560b7f50177845e409910ed855b1a27
 F test/shell2.test 2e7a32c9ee03c6398478637d72416d5b9ebd9777
 F test/shell3.test 1448cb715b8b5f139d96e0e4d3e94ae31fd0a713
 F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9
@@ -1088,7 +1088,7 @@ F test/tclsqlite.test c6d9f546f79d15d0134c1e06583fb3ee0c3afad3
 F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
-F test/tester.tcl 5604f2697e8fa9b12b6180122d84e1a9093ca8a3
+F test/tester.tcl f2b99e912d4da1e5755969b8614febd883885c8b
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -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 a7c080a90a236fbc18b9a42b78dbed4dd8a25160
-R 4fb0bc40e02c2e4ca004a6ff507130b3
+P 219a251e182bf43376fbc8ae1ce6f77f18a1b092
+R c56b0aa6959f9b74a14b039c91d81909
 U drh
-Z 2e9acf052ed53f3a7f143522bd4e6960
+Z 93b7eb233dfe81212bc718ee014c61a9

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

diff --git a/test/shell1.test b/test/shell1.test
index 44886b9f389740fae23031ef6ec3d22098895b65..8669559e446fd3321cc170ca352168a4493a98fc 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -275,11 +275,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"
+  catchcmd "-csv test.db" ".databases"
 } "/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"
+  catchcmd "test.db" ".databases BAD"
 } "/0.+main.+[string map {/ ".{1,2}"} [string range [get_pwd] 0 10]].*/"
 
 # .dump ?TABLE? ...      Dump the database in an SQL text format

diff --git a/test/tester.tcl b/test/tester.tcl
index 75963e108d48e46fec273a3bf680d086e9952978..eadaf2eb31a966822eaf9d26be572b0b3415d68d 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -823,17 +823,6 @@ proc catchcmd {db {cmd ""}} {
   list $rc $msg
 }
 
-proc catchcmd_collapse_space {db {cmd ""}} {
-  global CLI
-  set out [open cmds.txt w]
-  puts $out $cmd
-  close $out
-  set line "exec $CLI $db < cmds.txt"
-  set rc [catch { eval $line } msg]
-  regsub -all {\s+} $msg { } msg
-  list $rc $msg
-}
-
 proc catchcmdex {db {cmd ""}} {
   global CLI
   set out [open cmds.txt w]