From: drh <drh@noemail.net>
Date: Sun, 21 Aug 2005 18:21:50 +0000 (+0000)
Subject: Disable malloc tests when not compiled with SQLITE_DEBUG. (CVS 2608)
X-Git-Tag: version-3.6.10~3551
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=788581d78a7e7183cc4625710d25f37987b555e6;p=thirdparty%2Fsqlite.git

Disable malloc tests when not compiled with SQLITE_DEBUG. (CVS 2608)

FossilOrigin-Name: f372682fa375c22213da0e4cd8413eab3c6ac85b
---

diff --git a/manifest b/manifest
index c5cd08c2a3..dca5bb908b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\screate\san\serror\smessage\sif\sthere\sis\sno\serror.\s(CVS\s2607)
-D 2005-08-21T17:48:47
+C Disable\smalloc\stests\swhen\snot\scompiled\swith\sSQLITE_DEBUG.\s(CVS\s2608)
+D 2005-08-21T18:21:50
 F Makefile.in b109ddb46a5550d0732dcd6caca01c123f6d5cdd
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -93,12 +93,12 @@ F test/all.test 7f0988442ab811dfa41793b5b550f5828ce316f3
 F test/alter.test 9d6837a3d946b73df692b7cef2a7644d2e2f6bc6
 F test/alter2.test 60ba0a7057dc71ad630a1cc7c487104346849d50
 F test/alter3.test d4eecd8dbd008d0e66f1c201fa6dc2edca853c38
-F test/altermalloc.test c3a76eb7f6b07793b316246aef5ecfd9f74c33b1
+F test/altermalloc.test 6e1f404ec021eb2ba6582e3c77b0a35cf206b7af
 F test/analyze.test a1206c7430606ffa20bcbb220c87c2873f5efdd4
 F test/attach.test f320e98bcca68d100cab7666a0c9a93ac5f236bd
 F test/attach2.test 3396c012a39ddf7ba6b528d80bd79554168aa115
 F test/attach3.test 63013383adc4380af69779f34f4af19bd49f7cbe
-F test/attachmalloc.test eb099a3aa44be5adb12b65ef0d13fcd11f1c403b
+F test/attachmalloc.test cdb26c42850f04698377ccec05f5fa89d987837c
 F test/auth.test 973ae7274eae32c4453fbbcbd0ec2b80c5b1eeb3
 F test/autoinc.test 395fbac8bc158d3599995c73bfb15c418a5429f0
 F test/autovacuum.test cf2719b17659f7a011202ad05905654cedf26023
@@ -297,7 +297,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 7f4302686e55f22b281d98a8a3b89300f4ce4eb6
-R 99f431248345c07efd706bf5e546af2d
+P 3aa47c5587819a5fc3e2cb53a7fbc79ba65f0c3b
+R 738a6a8914c6fc9dd703dc52dd4d6e4a
 U drh
-Z c0a644bf7151c7c7ba20f247f8e159f8
+Z 208f183f37a62ec3b16d53628a45819e
diff --git a/manifest.uuid b/manifest.uuid
index 69d67fffc9..e6aaf6dc2b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3aa47c5587819a5fc3e2cb53a7fbc79ba65f0c3b
\ No newline at end of file
+f372682fa375c22213da0e4cd8413eab3c6ac85b
\ No newline at end of file
diff --git a/test/altermalloc.test b/test/altermalloc.test
index d918a9da9d..d2f39b240c 100644
--- a/test/altermalloc.test
+++ b/test/altermalloc.test
@@ -12,12 +12,20 @@
 # focus of this script is testing the ALTER TABLE statement and
 # specifically out-of-memory conditions within that command.
 #
-# $Id: altermalloc.test,v 1.1 2005/08/19 19:14:13 drh Exp $
+# $Id: altermalloc.test,v 1.2 2005/08/21 18:21:50 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+# Only run these tests if memory debugging is turned on.
+#
+if {[info command sqlite_malloc_stat]==""} {
+  puts "Skipping malloc tests: not compiled with -DSQLITE_DEBUG..."
+  finish_test
+  return
+}
+
 # If SQLITE_OMIT_ALTERTABLE is defined, omit this file.
 ifcapable !altertable {
   finish_test
diff --git a/test/attachmalloc.test b/test/attachmalloc.test
index 707e4ff5e5..3bedaaecfd 100644
--- a/test/attachmalloc.test
+++ b/test/attachmalloc.test
@@ -12,12 +12,21 @@
 # focus of this script is testing the ATTACH statement and
 # specifically out-of-memory conditions within that command.
 #
-# $Id: attachmalloc.test,v 1.1 2005/08/20 03:03:04 drh Exp $
+# $Id: attachmalloc.test,v 1.2 2005/08/21 18:21:50 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+# Only run these tests if memory debugging is turned on.
+#
+if {[info command sqlite_malloc_stat]==""} {
+  puts "Skipping malloc tests: not compiled with -DSQLITE_DEBUG..."
+  finish_test
+  return
+}
+
+
 # Usage: do_malloc_test <test name> <options...>
 #
 # The first argument, <test number>, is an integer used to name the