Index: test/e_walauto.test ================================================================== --- test/e_walauto.test +++ test/e_walauto.test @@ -169,11 +169,10 @@ # EVIDENCE-OF: R-33080-59193 Checkpoints initiated by this mechanism # are PASSIVE. # set ::busy_callback_count 0 proc busy_callback {args} { - puts Hello incr ::busy_callback_count return 0 } do_test 1.$tn.12.1 { sqlite3_wal_checkpoint_v2 db truncate Index: test/filectrl.test ================================================================== --- test/filectrl.test +++ test/filectrl.test @@ -37,11 +37,10 @@ file_control_lockproxy_test db [get_pwd] } {} do_test filectrl-1.6 { sqlite3 db test.db set fn [file_control_tempfilename db] - puts -nonewline \[$fn\] set fn } {/etilqs_/} db close forcedelete .test_control_lockproxy.db-conch test.proxy finish_test Index: test/fts3d.test ================================================================== --- test/fts3d.test +++ test/fts3d.test @@ -211,11 +211,11 @@ } } [list {0 0 0 4 0 4 5 2 0 3 8 1 0 5 10 4} \ {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 {} check_doclist_all fts3d-4.1.3 is {[1 0[1]] [3 0[1]]} #check_doclist_all fts3d-4.1.4 one {} Index: test/fts4incr.test ================================================================== --- test/fts4incr.test +++ test/fts4incr.test @@ -45,11 +45,13 @@ foreach s {0 1} { execsql "INSERT INTO t1(t1) VALUES('test-no-incr-doclist=$s')" 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 { execsql { CREATE VIRTUAL TABLE t2 USING fts4(order=DESC); Index: test/index5.test ================================================================== --- test/index5.test +++ test/index5.test @@ -65,12 +65,14 @@ } else { incr nNoncont } 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} db close tvfs delete Index: test/progress.test ================================================================== --- test/progress.test +++ test/progress.test @@ -162,11 +162,10 @@ INSERT INTO abc VALUES(4, 5, 6); INSERT INTO abc VALUES(7, 8, 9); } 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" catch {db eval {SELECT a, b, c FROM abc} { }} msg db progress 5 "expr 0" Index: test/select8.test ================================================================== --- test/select8.test +++ test/select8.test @@ -30,11 +30,10 @@ set result [execsql { SELECT DISTINCT artist,sum(timesplayed) AS total FROM songs GROUP BY LOWER(artist) }] -puts result=$result do_test select8-1.1 { execsql { SELECT DISTINCT artist,sum(timesplayed) AS total FROM songs GROUP BY LOWER(artist) Index: test/shared4.test ================================================================== --- test/shared4.test +++ test/shared4.test @@ -14,11 +14,10 @@ # $Id: shared4.test,v 1.2 2008/08/04 03:51:24 danielk1977 Exp $ 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. # ifcapable !shared_cache||!compound { Index: test/tester.tcl ================================================================== --- test/tester.tcl +++ test/tester.tcl @@ -1166,24 +1166,24 @@ } # Do an VDBE code dump on the SQL given # proc explain {sql {db db}} { - puts "" - puts "addr opcode p1 p2 p3 p4 p5 #" - puts "---- ------------ ------ ------ ------ --------------- -- -" + output2 "" + output2 "addr opcode p1 p2 p3 p4 p5 #" + output2 "---- ------------ ------ ------ ------ --------------- -- -" $db eval "explain $sql" {} { - puts [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}} { - puts "" - puts "addr opcode p1 p2 p3 p4 p5 #" - puts "---- ------------ ------ ------ ------ ---------------- -- -" + output2 "" + output2 "addr opcode p1 p2 p3 p4 p5 #" + output2 "---- ------------ ------ ------ ------ ---------------- -- -" # Set up colors for the different opcodes. Scheme is as follows: # # Red: Opcodes that write to a b-tree. @@ -1245,22 +1245,22 @@ } } $db eval "explain $sql" {} { if {[info exists linebreak($addr)]} { - puts "" + output2 "" } set I [string repeat " " $x($addr)] set col "" catch { set col $color($opcode) } - puts [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 ] } - puts "---- ------------ ------ ------ ------ ---------------- -- -" + output2 "---- ------------ ------ ------ ------ ---------------- -- -" } # Show the VDBE program for an SQL statement but omit the Trace # opcode at the beginning. This procedure can be used to prove # that different SQL statements generate exactly the same VDBE code. Index: test/vtab1.test ================================================================== --- test/vtab1.test +++ test/vtab1.test @@ -54,13 +54,10 @@ # # 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; } } {1 {no such module: echo}} do_test vtab1-1.1.2 {