More test output refinements.

FossilOrigin-Name: e64a5681793238fa04fe3636f48d34b2dd36cdfa

diff --git a/manifest b/manifest
index 76f440746a0b8e70fab5d0ff6dcd42bb33a8bbf0..88335ba49a8df05fae50911d121b51897ada2031 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\spossibly\sstray\soutput\sfrom\svarious\stests.
-D 2015-06-10T22:51:02.529
+C More\stest\soutput\srefinements.
+D 2015-06-10T23:02:38.561
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -831,7 +831,7 @@ F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
 F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
 F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
-F test/progress.test a282973d1d17f08071bc58a77d6b80f2a81c354d
+F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
 F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
 F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
@@ -950,7 +950,7 @@ F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
-F test/tester.tcl d23d57063764471b6fb51276b851ac51d364db06
+F test/tester.tcl b3a41e20f98a029a76e930b33d0711c5854267bb
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1148,7 +1148,7 @@ F test/vacuum4.test d3f8ecff345f166911568f397d2432c16d2867d9
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test f311691d696a5cc27e3c1b875cec1b0866b4ccd9
-F test/vtab1.test dbe0e9e121102d0ba365f20d126a72676aa2343f
+F test/vtab1.test 6210e076997f176bedc300a87ad6404651b601dd
 F test/vtab2.test f8cd1bb9aba7143eba97812d9617880a36d247ad
 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
 F test/vtab4.test 942f8b8280b3ea8a41dae20e7822d065ca1cb275
@@ -1286,10 +1286,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 75b65f9d49daaf48e97042cb82ea554e2ec74eec
-R 7ce3aec9083e0231108814bdab12a834
-T *branch * testerOutput
-T *sym-testerOutput *
-T -sym-trunk *
+P f38e0be56fc086a3ce08134ade83ab61c9fca106
+R 27c776937a2faf6a3c6ca0150fe1d26e
 U mistachkin
-Z db6ff78743d076544ff22113ea65f70d
+Z 4bdc8fbc12892afab86b92929a73ad3a

diff --git a/manifest.uuid b/manifest.uuid
index 24021b6cbc013e4abcd6362934569ac3e85248bb..ec8126b5c80bfc41ecbc248836a2d7d3e60b9430 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f38e0be56fc086a3ce08134ade83ab61c9fca106
\ No newline at end of file
+e64a5681793238fa04fe3636f48d34b2dd36cdfa
\ No newline at end of file

diff --git a/test/progress.test b/test/progress.test
index 993426aa2b438ed0ef3ecaf01cc1f8763e4564fb..f6d7229243aa55666b550fc9da7777e291c5a392 100644 (file)
--- a/test/progress.test
+++ b/test/progress.test
@@ -164,7 +164,6 @@ do_test progress-1.7 {
   }
 
   set ::res [list]
-  explain {SELECT a, b, c FROM abc} 
   db eval {SELECT a, b, c FROM abc} {
     lappend ::res $a $b $c
     db progress 5 "expr 1"

diff --git a/test/tester.tcl b/test/tester.tcl
index 8fd53c8e42a84ac01146d5d230b5b75538e01640..8022d6a53846c5b21db312d71679ada763a7d82d 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -1168,20 +1168,20 @@ proc catchsql {sql {db db}} {
 # Do an VDBE code dump on the SQL given
 #
 proc explain {sql {db db}} {
-  output1 ""
-  output1 "addr  opcode        p1      p2      p3      p4               p5  #"
-  output1 "----  ------------  ------  ------  ------  ---------------  --  -"
+  output2 ""
+  output2 "addr  opcode        p1      p2      p3      p4               p5  #"
+  output2 "----  ------------  ------  ------  ------  ---------------  --  -"
   $db eval "explain $sql" {} {
-    output1 [format {%-4d  %-12.12s  %-6d  %-6d  %-6d  % -17s %s  %s} \
+    output2 [format {%-4d  %-12.12s  %-6d  %-6d  %-6d  % -17s %s  %s} \
       $addr $opcode $p1 $p2 $p3 $p4 $p5 $comment
     ]
   }
 }
 
 proc explain_i {sql {db db}} {
-  output1 ""
-  output1 "addr  opcode        p1      p2      p3      p4                p5  #"
-  output1 "----  ------------  ------  ------  ------  ----------------  --  -"
+  output2 ""
+  output2 "addr  opcode        p1      p2      p3      p4                p5  #"
+  output2 "----  ------------  ------  ------  ------  ----------------  --  -"
 
 
   # Set up colors for the different opcodes. Scheme is as follows:
@@ -1247,18 +1247,18 @@ proc explain_i {sql {db db}} {
 
   $db eval "explain $sql" {} {
     if {[info exists linebreak($addr)]} {
-      puts ""
+      output2 ""
     }
     set I [string repeat " " $x($addr)]
 
     set col ""
     catch { set col $color($opcode) }
 
-    output1 [format {%-4d  %s%s%-12.12s%s  %-6d  %-6d  %-6d  % -17s %s  %s} \
+    output2 [format {%-4d  %s%s%-12.12s%s  %-6d  %-6d  %-6d  % -17s %s  %s} \
       $addr $I $col $opcode $D $p1 $p2 $p3 $p4 $p5 $comment
     ]
   }
-  output1 "----  ------------  ------  ------  ------  ----------------  --  -"
+  output2 "----  ------------  ------  ------  ------  ----------------  --  -"
 }
 
 # Show the VDBE program for an SQL statement but omit the Trace

diff --git a/test/vtab1.test b/test/vtab1.test
index cd21153f0636115d0b636d7c46537096d852ad49..84de4cffa56413453a30be6f621bd4b29ed34b76 100644 (file)
--- a/test/vtab1.test
+++ b/test/vtab1.test
@@ -56,9 +56,6 @@ ifcapable !vtab||!schema_pragmas {
 # We cannot create a virtual table if the module has not been registered.
 #
 do_test vtab1-1.1.1 {
-  explain {
-    CREATE VIRTUAL TABLE t1 USING echo;
-  }
   catchsql {
     CREATE VIRTUAL TABLE t1 USING echo;
   }