Fix a bug in the new misc6.test script. Fix error messages when not

compiled with memory debugging enabled.  Ticket #1957. (CVS 3392)

FossilOrigin-Name: 9fb92024bf5058bdc32066a0d07b93da575779fa

diff --git a/manifest b/manifest
index 5d8f3507fd7db6aa9eb06a68b97d27b8ba71184b..7e2157f505e89852469a5d7ad71b41c70ce3af28 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sstrings\sreturned\sby\ssqlite3_value_text()\sand\ssqlite3_value_text16()\nare\salways\s'\\000'-terminated.\s(CVS\s3391)
-D 2006-09-04T15:53:53
+C Fix\sa\sbug\sin\sthe\snew\smisc6.test\sscript.\s\sFix\serror\smessages\swhen\snot\ncompiled\swith\smemory\sdebugging\senabled.\s\sTicket\s#1957.\s(CVS\s3392)
+D 2006-09-04T18:54:14
 F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -127,14 +127,14 @@ F test/all.test 5df90d015ca63fcef2a4b62c24f7316b66c4bfd4
 F test/alter.test 29234396d738966d512dcb0d71c137a2315d38d7
 F test/alter2.test cc0b8832e4e98605dbc26910efd4bb89abe59cb2
 F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
-F test/altermalloc.test 6e1f404ec021eb2ba6582e3c77b0a35cf206b7af
+F test/altermalloc.test 19323e0f452834044c27a54c6e78554d706de7ba
 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
 F test/async.test 464dc7c7ccb144e8c82ecca429e6d7cd1c96bd6e
 F test/async2.test 81e4a1fd010c903eb3b763fdb4c4cad7a99afb14
 F test/attach.test c616a88eab6b6fd99b7b2fcf449420f14628bc0b
 F test/attach2.test 0e6a7c54343c85dd877a1e86073a05176043ed40
 F test/attach3.test eafcafb107585aecc2ed1569a77914138eef46a9
-F test/attachmalloc.test cdb26c42850f04698377ccec05f5fa89d987837c
+F test/attachmalloc.test 03eeddd06e685ddbe975efd51824e4941847e5f4
 F test/auth.test 66923137cf78475f5671b5e6e6274935e055aea0
 F test/auth2.test 8da06f0ffcfd98154dda78e0f3b35a6503c27b64
 F test/autoinc.test 60005a676e3e4e17dfa9dbd08aa0b76587ff97e3
@@ -219,7 +219,7 @@ F test/lock2.test d83ba79d3c4fffdb5b926c7d8ca7a36c34288a55
 F test/lock3.test 615111293cf32aa2ed16d01c6611737651c96fb9
 F test/main.test e7212ce1023957c7209778cc87fa932bd79ba89a
 F test/malloc.test 4d5d382e40f1171cc63adb44aca4ab2dbb8a098c
-F test/malloc2.test e6e321db96d6c94cb18bf82ad7215070c41e624e
+F test/malloc2.test 4ed7d719542c4570dec9c2ebe2bbdf3a9f3b0d05
 F test/malloc3.test fd4186bee73c2a2638f4e2a05a684c06836f725b
 F test/malloc4.test 59cd02f71b363302a04c4e77b97c0a1572eaa210
 F test/malloc5.test 7425272e263325fda7d32cb55706e52b5c09e7e0
@@ -234,7 +234,7 @@ F test/misc2.test 9740c2fb7e4a69b2bebd4c5fd9ba45ae27b27e98
 F test/misc3.test 7bd937e2c62bcc6be71939faf068d506467b1e03
 F test/misc4.test b043a05dea037cca5989f3ae09552fa16119bc80
 F test/misc5.test 83bceca3d38ed10ced00271e02b26b24795def83
-F test/misc6.test 6d1b1535ad9e8788334ac2462deec662a2f82c57
+F test/misc6.test 3de55ec5cadf466ada587173faa5d6a4790a8bb7
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
 F test/null.test 9503e1f63e959544c006d9f01709c5b5eab67d54
@@ -396,7 +396,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 367bd8376f323beb3148eab86ada1a3cb379ba3b
-R 65d3fac7dc50afc9b2c593fb5d16df61
+P 2c63588b45f4e1ab9b9f1b72c901f3800433424a
+R f402629df719cd6a62a288d804cc12e4
 U drh
-Z 7a672874943fae922a528231fba04d93
+Z 73048297660aa7bcb266fb7c1ff65219

diff --git a/manifest.uuid b/manifest.uuid
index 53c7fabd35c68af6c7fbf7d519276b82a8067b95..461d96b13ecde1db167200286dc8cf0d1c4db29f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2c63588b45f4e1ab9b9f1b72c901f3800433424a
\ No newline at end of file
+9fb92024bf5058bdc32066a0d07b93da575779fa
\ No newline at end of file

diff --git a/test/altermalloc.test b/test/altermalloc.test
index d2f39b240cd5f46bd12da5424a994c4b46553923..d9911bfb9257dd54afa7df6885059e85438ada0e 100644 (file)
--- a/test/altermalloc.test
+++ b/test/altermalloc.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ALTER TABLE statement and
 # specifically out-of-memory conditions within that command.
 #
-# $Id: altermalloc.test,v 1.2 2005/08/21 18:21:50 drh Exp $
+# $Id: altermalloc.test,v 1.3 2006/09/04 18:54:14 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -21,7 +21,7 @@ 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..."
+  puts "Skipping malloc tests: not compiled with -DSQLITE_MEMDEBUG=1"
   finish_test
   return
 }

diff --git a/test/attachmalloc.test b/test/attachmalloc.test
index 3bedaaecfd640b08795e57842d877574278ce1ae..fb9d4f868f2dbff132f7eed3f875bfb32831be57 100644 (file)
--- a/test/attachmalloc.test
+++ b/test/attachmalloc.test
@@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH statement and
 # specifically out-of-memory conditions within that command.
 #
-# $Id: attachmalloc.test,v 1.2 2005/08/21 18:21:50 drh Exp $
+# $Id: attachmalloc.test,v 1.3 2006/09/04 18:54:14 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -21,7 +21,7 @@ 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..."
+  puts "Skipping malloc tests: not compiled with -DSQLITE_MEMDEBUG=1"
   finish_test
   return
 }

diff --git a/test/malloc2.test b/test/malloc2.test
index bce5b0141c57f6c7886e5e351f7297b49714f42e..d80d6f89fd35070b0535309fc8319a069dca8664 100644 (file)
--- a/test/malloc2.test
+++ b/test/malloc2.test
@@ -11,7 +11,7 @@
 # This file attempts to check that the library can recover from a malloc()
 # failure when sqlite3_global_recover() is invoked.
 #
-# $Id: malloc2.test,v 1.4 2005/12/06 12:53:01 danielk1977 Exp $
+# $Id: malloc2.test,v 1.5 2006/09/04 18:54:14 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -19,7 +19,7 @@ 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..."
+  puts "Skipping malloc tests: not compiled with -DSQLITE_MEMDEBUG=1"
   finish_test
   return
 }

diff --git a/test/misc6.test b/test/misc6.test
index d751de83af5a24c392efc9cbed928d5afd4a5a0a..b622a88bc6eb843918911e508e6a8d565722dcf6 100644 (file)
--- a/test/misc6.test
+++ b/test/misc6.test
@@ -13,7 +13,7 @@
 # This file implements tests to make sure sqlite3_value_text()
 # always returns a null-terminated string.
 #
-# $Id: misc6.test,v 1.1 2006/09/04 15:53:53 drh Exp $
+# $Id: misc6.test,v 1.2 2006/09/04 18:54:14 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -41,5 +41,6 @@ do_test misc6-1.3 {
 do_test misc6-1.4 {
   sqlite3_column_text $STMT 0
 } {00300031003200330034}
+sqlite3_finalize $STMT
 
 finish_test