Remove possibly stray output from various tests.

FossilOrigin-Name: f38e0be56fc086a3ce08134ade83ab61c9fca106

diff --git a/manifest b/manifest
index 7b46a7527ca70dd58f34d4511d34a53ae2522b7c..76f440746a0b8e70fab5d0ff6dcd42bb33a8bbf0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sminor\stypo\sin\sthe\squicktest\sMSVC\smakefile\starget.
-D 2015-06-10T22:03:40.913
+C Remove\spossibly\sstray\soutput\sfrom\svarious\stests.
+D 2015-06-10T22:51:02.529
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1063c58075b7400d93326b0eb332b48a54f53025
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -510,7 +510,7 @@ F test/e_update.test 312cb8f5ccfe41515a6bb092f8ea562a9bd54d52
 F test/e_uri.test 5ae33760fb2039c61aa2d90886f1664664173585
 F test/e_vacuum.test 5bfbdc21b65c0abf24398d0ba31dc88d93ca77a9
 F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
-F test/e_walauto.test 6544af03423abc61b53cfb976839385ddc2a0a70
+F test/e_walauto.test 280714ddf14e1a47dcbc59d515cd0b026dfd5567
 F test/e_walckpt.test 65e29b6631e51f210f83e4ff11571e647ba93608
 F test/e_walhook.test da3ea8b3483d1af72190337bda50155a91a4b664
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
@@ -528,7 +528,7 @@ F test/expr.test 79c3e7502d9e571553b85f0ecc8ff2ac7d0e4931
 F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
 F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
-F test/filectrl.test 14fa712e42c4cb791e09dfd58a6a03efb47ef13a
+F test/filectrl.test 7c13f96457435238da99aff7343ad6a3a4885787
 F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
 F test/fkey1.test de5b287f6a480b36bd51e8debcf48168e26e4ed2
 F test/fkey2.test f3d27ecba480a348c328965d154214719bb158a9
@@ -603,7 +603,7 @@ F test/fts3conf.test ee8500c86dd58ec075e8831a1e216a79989436de
 F test/fts3corrupt.test 2710b77983cc7789295ddbffea52c1d3b7506dbb
 F test/fts3corrupt2.test 6d96efae2f8a6af3eeaf283aba437e6d0e5447ba
 F test/fts3cov.test e0fb00d8b715ddae4a94c305992dfc3ef70353d7
-F test/fts3d.test 95c17d1b67b33a5eac0bf5a0d11116a0c0ac7a3a
+F test/fts3d.test d3e9c8fb75135ada06bf3bab4f9666224965d708
 F test/fts3defer.test 0be4440b73a2e651fc1e472066686d6ada4b9963
 F test/fts3defer2.test c540f5f5c2840f70c68fd9b597df817ec7170468
 F test/fts3defer3.test dd53fc13223c6d8264a98244e9b19abd35ed71cd
@@ -637,7 +637,7 @@ F test/fts4content.test abb0c77bc3da3df64fec72e00844d2257a90025d
 F test/fts4docid.test e33c383cfbdff0284685604d256f347a18fdbf01
 F test/fts4growth.test df10fde9f47cf5c71861e63fd8efcd573c4f7e53
 F test/fts4growth2.test 2f063be1902a73cd087355837c52fed42ac11a5d
-F test/fts4incr.test 361960ed3550e781f3f313e17e2182ef9cefc0e9
+F test/fts4incr.test 4e353a0bd886ea984e56fce9e77724fc923b8d0d
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
@@ -688,7 +688,7 @@ F test/index.test 4d990005a67a36984e4f1a5f1bdccea8d08da4ee
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test b6ec456cf3b81d9a32123fe7e449bde434db338b
 F test/index4.test ab92e736d5946840236cd61ac3191f91a7856bf6
-F test/index5.test 25b0b451aceed4ac5f7d49f856f6de7257470b3e
+F test/index5.test 8621491915800ec274609e42e02a97d67e9b13e7
 F test/index6.test 3ae54e53c53f2adcacda269237d8e52bdb05a481
 F test/index7.test 9c6765a74fc3fcde7aebc5b3bd40d98df14a527c
 F test/indexedby.test 5f527a78bae74c61b8046ae3037f9dfb0bf0c353
@@ -876,7 +876,7 @@ F test/select4.test 6d5bc6d178a367e8b48fa1c1d3ea12cae9c2d650
 F test/select5.test e758b8ef94f69b111df4cb819008856655dcd535
 F test/select6.test 39eac4a5c03650b2b473c532882273283ee8b7a0
 F test/select7.test 7fd2ef598cfabb6b9ff6ac13973b91d0527df49d
-F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
+F test/select8.test 8c8f5ae43894c891efc5755ed905467d1d67ad5d
 F test/select9.test aebc2bb0c3bc44606125033cbcaac2c8d1f33a95
 F test/selectA.test e452bdb975f488ea46d091382a9185b5853ed2c7
 F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
@@ -889,7 +889,7 @@ F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
 F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
 F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108
-F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
+F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
 F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
 F test/shared7.test a81e99f83e6c51b02ac99c96fb3a2a7b5978c956
 F test/shared8.test 00a07bf5e1337ecf72e94542bdefdc330d7a2538
@@ -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 ca396a3f867c1bd3603400ca8f17bbffd87985b7
+F test/tester.tcl d23d57063764471b6fb51276b851ac51d364db06
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1286,7 +1286,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 6ddef2ad35ceb5822fc14c65bc7c6a2662edb63c
-R c63a194dd469f312ca0f35c47faf1707
+P 75b65f9d49daaf48e97042cb82ea554e2ec74eec
+R 7ce3aec9083e0231108814bdab12a834
+T *branch * testerOutput
+T *sym-testerOutput *
+T -sym-trunk *
 U mistachkin
-Z c108f8ac4d75e13d11936c87d29e2e70
+Z db6ff78743d076544ff22113ea65f70d

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

diff --git a/test/e_walauto.test b/test/e_walauto.test
index a1f4eb7079cc929bad2c467f72e1e003c9608973..093b13f940f95547e595013479b3087eeed49667 100644 (file)
--- a/test/e_walauto.test
+++ b/test/e_walauto.test
@@ -171,7 +171,6 @@ foreach {tn code} {
   #
   set ::busy_callback_count 0
   proc busy_callback {args} {
-  puts Hello
     incr ::busy_callback_count
     return 0
   }

diff --git a/test/filectrl.test b/test/filectrl.test
index 1d878bf968b002693118ac973c7ab5c5a0302e61..28fecee92fc805727534880bc8bbf54b277ece3c 100644 (file)
--- a/test/filectrl.test
+++ b/test/filectrl.test
@@ -39,7 +39,6 @@ do_test filectrl-1.5 {
 do_test filectrl-1.6 {
   sqlite3 db test.db
   set fn [file_control_tempfilename db]
-  puts -nonewline \[$fn\]
   set fn
 } {/etilqs_/}
 db close

diff --git a/test/fts3d.test b/test/fts3d.test
index 5c04ead0a05446915856b16c6419dc6b9e8d9abf..83af4d2a374ae2d651e9d5f47af49c5db18d4298 100644 (file)
--- a/test/fts3d.test
+++ b/test/fts3d.test
@@ -213,7 +213,7 @@ do_test fts3d-4.matches {
         {0 1 0 4 0 2 5 3 0 3 9 1 0 5 11 4} \
         {0 0 0 4 0 4 5 2 0 3 8 1 0 5 10 4}]
 
-puts [db eval {SELECT c FROM t1 } ]
+db eval {SELECT c FROM t1 }
 check_terms_all fts3d-4.1      {a four is test that this was}
 check_doclist_all fts3d-4.1.1  a {[1 0[2]] [2 0[2]] [3 0[2]]}
 check_doclist_all fts3d-4.1.2  four {}

diff --git a/test/fts4incr.test b/test/fts4incr.test
index 17212efce7fd81ffce82ce14c95da665cf9d234a..92104888b427a1869d851fd383ba236109c56dde 100644 (file)
--- a/test/fts4incr.test
+++ b/test/fts4incr.test
@@ -47,7 +47,9 @@ foreach {tn q res} {
     do_execsql_test 2.$tn.$s $q $res
     set t($s) [lindex [time [list execsql $q] 100] 0]
   }
-  puts "with optimization: $t(0)    without: $t(1)"
+  if {0} {
+    puts "with optimization: $t(0)    without: $t(1)"
+  }
 }
 
 do_test 2.1 {

diff --git a/test/index5.test b/test/index5.test
index e369d75717e48e6b0c26cc618f85b7183618e548..4c0aa0431e626dcaac66e811cca314b2eb54acbc 100644 (file)
--- a/test/index5.test
+++ b/test/index5.test
@@ -67,8 +67,10 @@ do_test 1.3 {
     }
     set iPrev $iNext
   }
-  puts -nonewline \
-      " (forward=$nForward, back=$nBackward, noncontiguous=$nNoncont)"
+  if {0} {
+    puts -nonewline \
+        " (forward=$nForward, back=$nBackward, noncontiguous=$nNoncont)"
+  }
 
   expr {$nForward > 2*($nBackward + $nNoncont)}
 } {1}

diff --git a/test/select8.test b/test/select8.test
index 98626641bf164c2715145b7b7daea17ec902a24c..39b27394993db59d7e70b160eacda8ce6bf75118 100644 (file)
--- a/test/select8.test
+++ b/test/select8.test
@@ -32,7 +32,6 @@ set result [execsql {
   FROM songs      
   GROUP BY LOWER(artist)      
 }]
-puts result=$result
 do_test select8-1.1 {
   execsql {
     SELECT DISTINCT artist,sum(timesplayed) AS total      

diff --git a/test/shared4.test b/test/shared4.test
index 83925b06e4cbf79a1d5365cb0ddffad7f629c543..88959db42d767600cc6b74965619f47a2222f587 100644 (file)
--- a/test/shared4.test
+++ b/test/shared4.test
@@ -16,7 +16,6 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 db close
-puts hello
 
 # This script is only valid if we are running shared-cache mode in a
 # threadsafe-capable database engine.

diff --git a/test/tester.tcl b/test/tester.tcl
index a83054fbe77e8ffa52ccfc564da3349d80c2f4d4..8fd53c8e42a84ac01146d5d230b5b75538e01640 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}} {
-  puts ""
-  puts "addr  opcode        p1      p2      p3      p4               p5  #"
-  puts "----  ------------  ------  ------  ------  ---------------  --  -"
+  output1 ""
+  output1 "addr  opcode        p1      p2      p3      p4               p5  #"
+  output1 "----  ------------  ------  ------  ------  ---------------  --  -"
   $db eval "explain $sql" {} {
-    puts [format {%-4d  %-12.12s  %-6d  %-6d  %-6d  % -17s %s  %s} \
+    output1 [format {%-4d  %-12.12s  %-6d  %-6d  %-6d  % -17s %s  %s} \
       $addr $opcode $p1 $p2 $p3 $p4 $p5 $comment
     ]
   }
 }
 
 proc explain_i {sql {db db}} {
-  puts ""
-  puts "addr  opcode        p1      p2      p3      p4                p5  #"
-  puts "----  ------------  ------  ------  ------  ----------------  --  -"
+  output1 ""
+  output1 "addr  opcode        p1      p2      p3      p4                p5  #"
+  output1 "----  ------------  ------  ------  ------  ----------------  --  -"
 
 
   # Set up colors for the different opcodes. Scheme is as follows:
@@ -1254,11 +1254,11 @@ proc explain_i {sql {db db}} {
     set col ""
     catch { set col $color($opcode) }
 
-    puts [format {%-4d  %s%s%-12.12s%s  %-6d  %-6d  %-6d  % -17s %s  %s} \
+    output1 [format {%-4d  %s%s%-12.12s%s  %-6d  %-6d  %-6d  % -17s %s  %s} \
       $addr $I $col $opcode $D $p1 $p2 $p3 $p4 $p5 $comment
     ]
   }
-  puts "----  ------------  ------  ------  ------  ----------------  --  -"
+  output1 "----  ------------  ------  ------  ------  ----------------  --  -"
 }
 
 # Show the VDBE program for an SQL statement but omit the Trace