Disable tests that debug on SQLITE_MEMDEBUG when that macro is not defined. (CVS...

FossilOrigin-Name: 741d6fb096dcb232871d3a8468c386022afcf554

diff --git a/manifest b/manifest
index f6b8505994c96478ecf0aae544a254fc6d81a815..c43eabecc5d139d4d8640f537e64456ef3b529fa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sautoconf\smakefile\swith\sall\sthe\slatest\schanges.\s(CVS\s4305)
-D 2007-08-27T23:38:43
+C Disable\stests\sthat\sdebug\son\sSQLITE_MEMDEBUG\swhen\sthat\smacro\sis\snot\sdefined.\s(CVS\s4306)
+D 2007-08-27T23:48:24
 F Makefile.in 51bdcd1708f0971bc6b5d8eb47f00d127a899345
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -173,14 +173,14 @@ F test/all.test 0b2117b4ccbb3dc88a5259d1735a04d20584b92b
 F test/alter.test c2a9402e17a731e5294ef370214bd9f88351d18d
 F test/alter2.test 50c3f554b8236d179d72511c0a4f23c5eb7f2af3
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
-F test/altermalloc.test 19162a6b6046a858ad123e57b75215f401ceb7fc
+F test/altermalloc.test b341e6515fa6cd9f0ac5d19153c556c9add70be9
 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
 F test/async.test 464dc7c7ccb144e8c82ecca429e6d7cd1c96bd6e
 F test/async2.test 8f2c70b831dac7292450d0a42580cf2dab497dbb
 F test/attach.test cf289abdb120053136649efd1306ab9d47fa41b2
 F test/attach2.test 78bc1a25ea8785c7571b44f5947ada2bd5d78127
 F test/attach3.test eafcafb107585aecc2ed1569a77914138eef46a9
-F test/attachmalloc.test c558251bcc3a2408d11fca42b9cee574fa3d74c2
+F test/attachmalloc.test fdbfd9dc0b600db14f9189690c6c12511cc3a56f
 F test/auth.test 66923137cf78475f5671b5e6e6274935e055aea0
 F test/auth2.test 8da06f0ffcfd98154dda78e0f3b35a6503c27b64
 F test/autoinc.test 60005a676e3e4e17dfa9dbd08aa0b76587ff97e3
@@ -307,7 +307,7 @@ F test/icu.test e6bfae7f625c88fd14df6f540fe835bdfc1e4329
 F test/in.test 369cb2aa1eab02296b4ec470732fe8c131260b1d
 F test/in2.test b1f447f4f0f67e9f83ff931e7e2e30873f9ea055
 F test/incrblob.test 7f95c929b719626443a996b105d2b0ff06f47818
-F test/incrblob_err.test bd993cdd0259461bdebbc7559fe7b11e8742f5b3
+F test/incrblob_err.test 9f88036c34bfd98d8b4990b25c7315c73094c4a4
 F test/incrvacuum.test 569347726ea5940c3359e3d8cabb3505595cb82f
 F test/incrvacuum2.test 82397ceb5941cbe852fd29bb33fcdf5665bc80c2
 F test/incrvacuum_ioerr.test cb331403b8dea3c5bae6163861ff25037b0df56a
@@ -562,7 +562,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P dc80b2e1f4e1d31479aad9f39e651e62f2601fb8
-R 9bfd590424b3b4326f717196e76ff94e
+P bc6d73d015327a9cf6b687aaf4b3f0d07e0fd484
+R 2349531d73bc37131a9a7284d5308814
 U drh
-Z 22e7c8ec93c637537b92777c4664baab
+Z 56024ff7bdc953200a8a79d2b652027f

diff --git a/manifest.uuid b/manifest.uuid
index fe8d6be9fbe0bcf973d3f812e7bc1419f66aa12f..4a7d87bc4df901675f986ff5799eedeb2216098a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bc6d73d015327a9cf6b687aaf4b3f0d07e0fd484
\ No newline at end of file
+741d6fb096dcb232871d3a8468c386022afcf554
\ No newline at end of file

diff --git a/test/altermalloc.test b/test/altermalloc.test
index a9085d063a123fdf58a775f0559747f3f0d74542..e4479ce6513d61e11cff33150b826cc1b5cb7605 100644 (file)
--- a/test/altermalloc.test
+++ b/test/altermalloc.test
@@ -12,14 +12,14 @@
 # focus of this script is testing the ALTER TABLE statement and
 # specifically out-of-memory conditions within that command.
 #
-# $Id: altermalloc.test,v 1.4 2007/08/25 13:09:26 danielk1977 Exp $
+# $Id: altermalloc.test,v 1.5 2007/08/27 23:48:24 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 # If SQLITE_OMIT_ALTERTABLE is defined, omit this file.
-ifcapable !altertable {
+ifcapable !altertable||!memdebug {
   finish_test
   return
 }

diff --git a/test/attachmalloc.test b/test/attachmalloc.test
index 785af235e135e348854a24b4500f054cb4670298..e9fbe0b8d374e2a3aa517668007cb3314170aaf6 100644 (file)
--- a/test/attachmalloc.test
+++ b/test/attachmalloc.test
@@ -12,12 +12,17 @@
 # focus of this script is testing the ATTACH statement and
 # specifically out-of-memory conditions within that command.
 #
-# $Id: attachmalloc.test,v 1.4 2007/08/25 13:37:49 danielk1977 Exp $
+# $Id: attachmalloc.test,v 1.5 2007/08/27 23:48:24 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !memdebug {
+  finish_test
+  return
+}
+
 source $testdir/malloc_common.tcl
 
 do_malloc_test attachmalloc-1 -tclprep {

diff --git a/test/incrblob_err.test b/test/incrblob_err.test
index 86e52d91e30db6cd491d856387054b05a52f2471..9b61c4ec28b1583fcab4568830458354e06323ee 100644 (file)
--- a/test/incrblob_err.test
+++ b/test/incrblob_err.test
@@ -9,13 +9,13 @@
 #
 #***********************************************************************
 #
-# $Id: incrblob_err.test,v 1.4 2007/08/25 13:09:26 danielk1977 Exp $
+# $Id: incrblob_err.test,v 1.5 2007/08/27 23:48:24 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-ifcapable {!incrblob} {
+ifcapable {!incrblob  || !memdebug} {
   finish_test
   return
 }