From 744f574889f877f468128835e86fbcf7c7131119 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Thu, 30 Aug 2007 15:16:04 +0000 Subject: [PATCH] Fixes for malloc4.test. (CVS 4340) FossilOrigin-Name: 23746924db3c005d1f75572c6cbb91db6fc41eb4 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/malloc4.test | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 344a2fdb01..3d1261d153 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sSQLITE_MIXED_ENDIAN_64BIT_FLOAT\soption\sso\sthat\sit\sworks\son\ngoofy\slinux\skernels\sthat\semploy\sCONFIG_FPE_FASTFPE.\s\sPatch\sfrom\nFrank\svan\sVugt.\s(CVS\s4339) -D 2007-08-30T15:05:08 +C Fixes\sfor\smalloc4.test.\s(CVS\s4340) +D 2007-08-30T15:16:05 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -348,7 +348,7 @@ F test/main.test e7212ce1023957c7209778cc87fa932bd79ba89a F test/malloc.test 52306f056e7359e68ed2e204f37f47a0e2020c57 F test/malloc2.test c1a74f46a3581b56df29ff46a4e1c99b41c44ad9 F test/malloc3.test ca656197fe627d006012f50f084a712bf154f0bb -F test/malloc4.test 08830f5964a95f5a75218f56e7742e5dbe482e53 +F test/malloc4.test 2691bdd25fc764449051b2098692e739555246a7 F test/malloc5.test 9db9205a5d444e23043368f961f92641c7770199 F test/malloc6.test 3733b9bd4e039c3239f869c40edbb88172025e2e F test/malloc7.test dd66d8f82916becf1d29b6640e4f4855485570f8 @@ -568,7 +568,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 18a5babb72102f9a82cb24757612a8b683a3f995 -R 8fce7bfd868038e0cdf6352f204f8e03 -U drh -Z a486c2c7c2c9dc221c09c07a8a467098 +P 71ab92e900512ad01047b46f734bd5f65998ecf9 +R c0dc5aea978543f645c277d88cedcb03 +U danielk1977 +Z ac30c668c1547b4e8dacce191621ac0d diff --git a/manifest.uuid b/manifest.uuid index 4af2d4186d..736a57f53a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -71ab92e900512ad01047b46f734bd5f65998ecf9 \ No newline at end of file +23746924db3c005d1f75572c6cbb91db6fc41eb4 \ No newline at end of file diff --git a/test/malloc4.test b/test/malloc4.test index 81d47ce01c..ee5216dcae 100644 --- a/test/malloc4.test +++ b/test/malloc4.test @@ -12,7 +12,7 @@ # This file contains tests to ensure that the library handles malloc() failures # correctly. The emphasis in this file is on sqlite3_column_XXX() APIs. # -# $Id: malloc4.test,v 1.7 2007/08/30 11:48:32 danielk1977 Exp $ +# $Id: malloc4.test,v 1.8 2007/08/30 15:16:05 danielk1977 Exp $ #--------------------------------------------------------------------------- # NOTES ON EXPECTED BEHAVIOUR @@ -41,7 +41,7 @@ ifcapable !utf16 { proc do_stmt_test {id sql} { set ::sql $sql set go 1 - for {set n 1} {$go} {incr n} { + for {set n 0} {$go} {incr n} { set testid "malloc4-$id.$n" # Prepare the statement @@ -51,7 +51,7 @@ proc do_stmt_test {id sql} { } {1} # Set the Nth malloc() to fail. - sqlite3_memdebug_fail $n -repeat 1 + sqlite3_memdebug_fail $n -repeat 0 # Test malloc failure in the _name(), _name16(), decltype() and # decltype16() APIs. Calls that occur after the malloc() failure should