Change the makefiles so that "make test" now runs the veryquick.test script instead of quick.test. Also modify veryquick.test to reuse the code in quick.test. veryquick.test is now the same as quick.test except that it omits all testing related to malloc and IO error simulation. (CVS 5308)

FossilOrigin-Name: 8c65146ea0e77e8e31fffc467806b1edf91fb4db

test/veryquick.test

@@ -4,147 +4,13 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
-# This file runs all tests.
+# This file runs all the tests run by quick.test except for those related
+# to malloc or IO error simulation. With these tests omitted, the overall
+# run time is reduced by about 75%.
 #
-# $Id: veryquick.test,v 1.7 2008/06/24 11:21:21 danielk1977 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
-    }
-  }
-}
+# $Id: veryquick.test,v 1.8 2008/06/25 17:54:55 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-rename finish_test really_finish_test
-proc finish_test {} {}
-set ISQUICK 1
+set ISVERYQUICK 1
+source $testdir/quick.test
 
-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
-  jrnlmode3.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
-  mutex2.test
-  onefile.test
-  permutations.test
-  quick.test
-  select9.test
-  soak.test
-  speed1.test
-  speed1p.test
-  speed2.test
-  speed3.test
-  speed4.test
-  speed4p.test
-  sqllimits1.test
-  vacuum3.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
-  }
-}
-set argv veryquick
-source $testdir/permutations.test
-set argv ""
-source $testdir/misuse.test
-
-set sqlite_open_file_count 0
-really_finish_test