Disable shared-cache OOM tests if not compiled with -DSQLITE_MEMDEBUG. (CVS 3016)

FossilOrigin-Name: 2d896667e460dcdaf83d18bd03050e917d54edc7

diff --git a/manifest b/manifest
index 81e331605eb84b2d38c3c188d2e17c0b2014b0da..e546f473442c79b1dc5a63e9517058c55b3ebb8a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Bug\sfix\sin\sthe\sWinCE\sbindings.\s(CVS\s3015)
-D 2006-01-23T22:15:07
+C Disable\sshared-cache\sOOM\stests\sif\snot\scompiled\swith\s-DSQLITE_MEMDEBUG.\s(CVS\s3016)
+D 2006-01-23T23:49:34
 F Makefile.in 53841eb72e9eeb6030a8ce28c2595a92f440fd10
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -228,7 +228,7 @@ F test/select7.test 1bf795b948c133a15a2a5e99d3270e652ec58ce6
 F test/server1.test e328b8e641ba8fe9273132cfef497383185dc1f5
 F test/shared.test 0ed247941236788c255b3b29b5a82d5ca71b6432
 F test/shared2.test 909fc0f0277684ed29cc1b36c8e159188aec7f28
-F test/shared_err.test 245a87e980db0042da81279fd615e70edffc20b6
+F test/shared_err.test c8a5b717178bca3f1f4cccebd167b08252833307
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
 F test/subselect.test 2d13fb7f450db3595adcdd24079a0dd1d2d6abc2
@@ -344,7 +344,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P b52674e5642a9d26b15a5d5c2a6716febaef130a
-R ae011a5f82c5959bbf15fc7ed747c313
+P c57922838a31b45f69ba14ae13df8a612884cb4b
+R 5e1b892c69d173cc527853a83af7875b
 U drh
-Z d3a94aa26cf3dc149e327933132cfc1b
+Z 074472f85902605580f7668797d6a950

diff --git a/manifest.uuid b/manifest.uuid
index b5d048f5a6a872cccad9e8d21b154fc6d18123e7..9609bd71c762f8eddfb04f47dc16c9aed0b11d02 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c57922838a31b45f69ba14ae13df8a612884cb4b
\ No newline at end of file
+2d896667e460dcdaf83d18bd03050e917d54edc7
\ No newline at end of file

diff --git a/test/shared_err.test b/test/shared_err.test
index 3f954c6824a5512bafc0daebede5006ab860011d..9a0478836cb0e912548171eb40dc6cbc08bf4974 100644 (file)
--- a/test/shared_err.test
+++ b/test/shared_err.test
@@ -13,7 +13,7 @@
 # cache context. What happens to connection B if one connection A encounters
 # an IO-error whilst reading or writing the file-system?
 #
-# $Id: shared_err.test,v 1.5 2006/01/23 13:09:47 danielk1977 Exp $
+# $Id: shared_err.test,v 1.6 2006/01/23 23:49:34 drh Exp $
 
 proc skip {args} {}
 
@@ -269,6 +269,14 @@ do_ioerr_test shared_ioerr-3 -tclprep {
   db2 close
 }
 
+# Only run these tests if memory debugging is turned on.
+#
+if {[info command sqlite_malloc_stat]==""} {
+   puts "Skipping malloc tests: not compiled with -DSQLITE_MEMDEBUG..."
+   finish_test
+   return
+}
+
 # Provoke a malloc() failure when a cursor position is being saved. This
 # only happens with index cursors (because they malloc() space to save the
 # current key value). It does not happen with tables, because an integer
@@ -326,4 +334,3 @@ do_malloc_test 5 -tclbody {
 catch {db close}
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test
-