Modify quick.test to support the QUICKTEST_INCLUDE environment variable, which can...

FossilOrigin-Name: fdfe22f0a568b5e8a5a2ad302d7c06b2696809b0

diff --git a/Makefile.in b/Makefile.in
index 8a29beb0675f761fe92d453419bb8c6e55c798eb..debe2f16dc12a184094fd8ec21e3ccdfd64dae85 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -170,7 +170,7 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
         main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
         memjournal.lo \
         mutex.lo mutex_noop.lo mutex_os2.lo mutex_unix.lo mutex_w32.lo \
-        opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
+        notify.lo opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
         pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
         random.lo resolve.lo rowset.lo select.lo status.lo \
         table.lo tokenize.lo trigger.lo update.lo \
@@ -231,6 +231,7 @@ SRC = \
   $(TOP)/src/mutex_os2.c \
   $(TOP)/src/mutex_unix.c \
   $(TOP)/src/mutex_w32.c \
+  $(TOP)/src/notify.c \
   $(TOP)/src/os.c \
   $(TOP)/src/os.h \
   $(TOP)/src/os_common.h \
@@ -611,6 +612,9 @@ mutex_unix.lo:      $(TOP)/src/mutex_unix.c $(HDR)
 mutex_w32.lo:  $(TOP)/src/mutex_w32.c $(HDR)
        $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mutex_w32.c
 
+notify.lo:     $(TOP)/src/notify.c $(HDR)
+       $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/notify.c
+
 pager.lo:      $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
        $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/pager.c
 

diff --git a/manifest b/manifest
index a72e316fa59f340057971bf716daf827fb24600e..febdeced82c08ad3a4326a2be6b7126590cb48e6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Additional\shyperlinks\sin\sthe\ssqlite3_unlock_notify()\sdocumentation.\s(CVS\s6349)
-D 2009-03-16T13:37:02
+C Modify\squick.test\sto\ssupport\sthe\sQUICKTEST_INCLUDE\senvironment\svariable,\swhich\scan\sbe\sused\sto\soverride\sthe\sbuilt-in\sEXCLUDE\slist.\s(CVS\s6350)
+D 2009-03-16T14:48:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
-F Makefile.in d64baddbf55cdf33ff030e14da837324711a4ef7
+F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
 F Makefile.vxwSH4 d53b4be86491060d498b22148951b6d765884cab
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
@@ -496,7 +496,7 @@ F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 47e9e5bbec8509023479d54ceb71c9d05a95308a
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
-F test/quick.test d93ab4f1eee87b89fddbe938e2f093ce33e7b46a
+F test/quick.test f6eb3a98643b5856626ad38933334762270db129
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
@@ -707,7 +707,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P b649a6cc5bfefddd6a04b1183647d2923e0a0daa
-R 5e4afca6d8529f70b5f09892d581c5b8
-U drh
-Z b7cc1162146a7aa78d69888842159f5d
+P 4dae5f6ed1662ca1c5c26d57049f7d349299468c
+R 2067a145cc50e0af662e0badf6001fed
+U danielk1977
+Z 047100a34f8b19dcfeccb468b80faa0c

diff --git a/manifest.uuid b/manifest.uuid
index 66ee5928a2591938e0f5c781316f67210e05cfea..76b2d4a7860d41d330fe7e3db5a5d12fac24634a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4dae5f6ed1662ca1c5c26d57049f7d349299468c
\ No newline at end of file
+fdfe22f0a568b5e8a5a2ad302d7c06b2696809b0
\ No newline at end of file

diff --git a/test/quick.test b/test/quick.test
index 11e6beffdaeb994a01d8cf10d66ea14a155c7322..8783a107816b2e59e2ff1552ae1a52f9bcdf2af1 100644 (file)
--- a/test/quick.test
+++ b/test/quick.test
@@ -6,7 +6,7 @@
 #***********************************************************************
 # This file runs all tests.
 #
-# $Id: quick.test,v 1.94 2009/03/12 14:43:28 danielk1977 Exp $
+# $Id: quick.test,v 1.95 2009/03/16 14:48:19 danielk1977 Exp $
 
 proc lshift {lvar} {
   upvar $lvar l
@@ -67,6 +67,7 @@ set EXCLUDE {
   misc7.test
   misuse.test
   mutex2.test
+  notify2.test
   onefile.test
   permutations.test
   quick.test
@@ -111,17 +112,26 @@ if {[sqlite3 -has-codec]} {
 set INCLUDE {
 }
 
-foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
-  # If this is "veryquick.test", do not run any of the malloc or 
-  # IO error simulations.
-  if {[info exists ISVERYQUICK] && (
-    [string match *malloc* $testfile] || [string match *ioerr* $testfile]
-  ) } {
-    continue
-  }
+# If the QUICKTEST_INCLUDE environment variable is set, then interpret
+# it as a list of test files. Always run these files, even if they
+# begin with "malloc*" or "ioerr*" or are part of the EXCLUDE list
+# defined above.
+#
+set QUICKTEST_INCLUDE {}
+catch { set QUICKTEST_INCLUDE $env(QUICKTEST_INCLUDE) }
 
+foreach testfile [lsort -dictionary [glob $testdir/*.test]] {
   set tail [file tail $testfile]
-  if {[lsearch -exact $EXCLUDE $tail]>=0} continue
+  if { [lsearch $QUICKTEST_INCLUDE $tail]<0 } {
+    # If this is "veryquick.test", do not run any of the malloc or 
+    # IO error simulations.
+    if {[info exists ISVERYQUICK] && (
+      [string match *malloc* $testfile] || [string match *ioerr* $testfile]
+    ) } {
+      continue
+    }
+    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