From 9e6675f73fad6129a38b537c30dc9177d74f1c42 Mon Sep 17 00:00:00 2001 From: drh Date: Mon, 31 Mar 2008 23:51:35 +0000 Subject: [PATCH] Add the veryquick.test script for a very fast overview test that omits all i/o and malloc testing. (CVS 4944) FossilOrigin-Name: f61df8daa89f07dad2a0ded00c326ef35dead257 --- manifest | 15 ++--- manifest.uuid | 2 +- test/all.test | 3 +- test/quick.test | 3 +- test/veryquick.test | 142 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 test/veryquick.test diff --git a/manifest b/manifest index bdee46c43e..a49a7e5251 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\sduplicate\sOP_Column\sopcodes\sby\sremembering\sprior\sresults.\nThis\sis\ssimilar\sto\sCSE,\sbut\sonly\sapplies\sto\scolumns.\s(CVS\s4943) -D 2008-03-31T23:48:04 +C Add\sthe\sveryquick.test\sscript\sfor\sa\svery\sfast\soverview\stest\sthat\somits\nall\si/o\sand\smalloc\stesting.\s(CVS\s4944) +D 2008-03-31T23:51:35 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in cf434ce8ca902e69126ae0f94fc9f7dc7428a5fa F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -186,7 +186,7 @@ F src/vtab.c 00cd16317b29495c185ff40e4b227917d5a371b2 F src/where.c 811fd1e5c67902499866d942dfa5f44550501adf F tclinstaller.tcl 4356d9d94d2b5ed5e68f9f0c80c4df3048dd7617 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 -F test/all.test d12210212bada2bde6d5aeb90969b86c1aa977d2 +F test/all.test d56a3ca8acdf761204aff0a2e7aa5eb8e11b31e6 F test/alter.test 1426bb4c8609731622a9bf9dd48c39f5931c4d7d F test/alter2.test dd55146e812622c8fc51fd2216bcd8dca8880752 F test/alter3.test 25b95a136708f22b87184fa6a4309eea03d65153 @@ -411,7 +411,7 @@ F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47 F test/printf.test c3405535b418d454e8a52196a0fc592ec9eec58d F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x F test/ptrchng.test 83150cb7b513e33cce90fdc68f4b1817551857c0 -F test/quick.test 1ab788b4ad66cc385d06d2dd1f0714ccfb52fb61 +F test/quick.test 3a71af14d9ec0d06e75468de69c71a1a5c059157 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6 F test/rdonly.test b34db316525440d3b42c32e83942c02c37d28ef0 F test/reindex.test 38b138abe36bf9a08c791ed44d9f76cd6b97b78b @@ -519,6 +519,7 @@ F test/utf16align.test 7360e84472095518c56746f76b1f9d4dce99fb4d F test/vacuum.test f67853a15caa120af591f819670f01a11fcc2bfc F test/vacuum2.test d3b9691541fe6ed5c711f547a1c7d70e9760ac6f F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102 +F test/veryquick.test 9bba6886026bb58a7332b6c96fd8270469f02177 F test/view.test 4864e3841ab3213a95297718b94d5d6a8d3bc78b F test/vtab1.test bd905d1d43637a700308da6ffcc4e014c27e2f0a F test/vtab2.test 1da49b015582965a8fc386aa23d051a5a622b08e @@ -619,7 +620,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 2126db39854c751aea6c95c67894ed9b9dfc0763 -R 4b1f8c1e4e6f9db1b293f92989ff9195 +P c29ee0fed23dcdbd9dde6b1e42b603100ea2389c +R ea5dee7bb1231c90f372bc524dc68887 U drh -Z ab18e0e600a8f0ab348be2f5f3f1ef8e +Z 9099251370f41c7219918acc2b43b496 diff --git a/manifest.uuid b/manifest.uuid index 5ca840bf53..b195260ad3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c29ee0fed23dcdbd9dde6b1e42b603100ea2389c \ No newline at end of file +f61df8daa89f07dad2a0ded00c326ef35dead257 \ No newline at end of file diff --git a/test/all.test b/test/all.test index d0dd79a63e..15a910d7b4 100644 --- a/test/all.test +++ b/test/all.test @@ -10,7 +10,7 @@ #*********************************************************************** # This file runs all tests. # -# $Id: all.test,v 1.53 2008/01/19 20:11:26 drh Exp $ +# $Id: all.test,v 1.54 2008/03/31 23:51:35 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -59,6 +59,7 @@ lappend EXCLUDE crash.test ;# Run seperately later. lappend EXCLUDE crash2.test ;# Run seperately later. lappend EXCLUDE autovacuum_crash.test ;# Run seperately later. lappend EXCLUDE quick.test ;# Alternate test driver script +lappend EXCLUDE veryquick.test ;# Alternate test driver script lappend EXCLUDE malloc.test ;# Run seperately later. lappend EXCLUDE misuse.test ;# Run seperately later. lappend EXCLUDE memleak.test ;# Alternate test driver script diff --git a/test/quick.test b/test/quick.test index c2d8ffdc9f..26dbf691bf 100644 --- a/test/quick.test +++ b/test/quick.test @@ -6,7 +6,7 @@ #*********************************************************************** # This file runs all tests. # -# $Id: quick.test,v 1.75 2008/03/28 15:44:10 danielk1977 Exp $ +# $Id: quick.test,v 1.76 2008/03/31 23:51:35 drh Exp $ proc lshift {lvar} { upvar $lvar l @@ -82,6 +82,7 @@ set EXCLUDE { utf16.test shared_err.test vtab_err.test + veryquick.test } if {[sqlite3 -has-codec]} { diff --git a/test/veryquick.test b/test/veryquick.test new file mode 100644 index 0000000000..bc5bcba744 --- /dev/null +++ b/test/veryquick.test @@ -0,0 +1,142 @@ +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# This file runs all tests. +# +# $Id: veryquick.test,v 1.1 2008/03/31 23:51:35 drh Exp $ + +proc lshift {lvar} { + upvar $lvar l + set ret [lindex $l 0] + set l [lrange $l 1 end] + return $ret +} +while {[set arg [lshift argv]] != ""} { + switch -- $arg { + -sharedpagercache { + sqlite3_enable_shared_cache 1 + } + -soak { + set SOAKTEST 1 + } + -start { + set STARTAT "[lshift argv]*" + } + default { + set argv [linsert $argv 0 $arg] + break + } + } +} + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +rename finish_test really_finish_test +proc finish_test {} {} +set ISQUICK 1 + +set EXCLUDE { + all.test + async.test + async2.test + altermalloc.test + attachmalloc.test + autovacuum_crash.test + autovacuum_ioerr.test + autovacuum_ioerr2.test + bitvec.test + corrupt.test + crash.test + crash2.test + crash3.test + crash4.test + crash6.test + crash7.test + diskfull.test + exclusive3.test + fts3.test + fuzz.test + fuzz_malloc.test + in2.test + interrupt.test + ioerr.test + ioerr2.test + loadext.test + mallocAll.test + malloc.test + malloc2.test + malloc3.test + malloc4.test + malloc5.test + malloc6.test + malloc7.test + malloc8.test + malloc9.test + mallocA.test + mallocB.test + mallocC.test + mallocD.test + mallocE.test + mallocF.test + mallocG.test + memleak.test + misc7.test + misuse.test + onefile.test + quick.test + soak.test + speed1.test + speed1p.test + speed2.test + speed3.test + speed4.test + speed4p.test + sqllimits1.test + + tkt2686.test + thread001.test + thread002.test + + incrvacuum_ioerr.test + autovacuum_crash.test + btree8.test + utf16.test + shared_err.test + vtab_err.test + veryquick.test +} + +if {[sqlite3 -has-codec]} { + # lappend EXCLUDE \ + # conflict.test +} + + +# Files to include in the test. If this list is empty then everything +# that is not in the EXCLUDE list is run. +# +set INCLUDE { +} + +foreach testfile [lsort -dictionary [glob $testdir/*.test]] { + set tail [file tail $testfile] + if {[lsearch -exact $EXCLUDE $tail]>=0} continue + if {[llength $INCLUDE]>0 && [lsearch -exact $INCLUDE $tail]<0} continue + if {[info exists STARTAT] && [string match $STARTAT $tail]} {unset STARTAT} + if {[info exists STARTAT]} continue + source $testfile + catch {db close} + if {$sqlite_open_file_count>0} { + puts "$tail did not close all files: $sqlite_open_file_count" + incr nErr + lappend ::failList $tail + set sqlite_open_file_count 0 + } +} +source $testdir/misuse.test + +set sqlite_open_file_count 0 +really_finish_test