From eacb6c59bc089ec465f2e1b30f8f89966c50ea40 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Thu, 30 Aug 2007 10:49:54 +0000 Subject: [PATCH] Fix some problems in async2.test. No code changes. (CVS 4333) FossilOrigin-Name: d80d87c239df06ef2182bc2b78e6d4c1852d28c9 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/async2.test | 13 +++++++------ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/manifest b/manifest index ac22c3bbfd..cba549ad92 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Better\shandle\sa\smalloc()\sfailure\sin\ssqlite3PagerSetPagesize().\s(CVS\s4332) -D 2007-08-30T10:07:39 +C Fix\ssome\sproblems\sin\sasync2.test.\sNo\scode\schanges.\s(CVS\s4333) +D 2007-08-30T10:49:55 F Makefile.in bfcc303429a5d9dcd552d807ee016c77427418c3 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -181,7 +181,7 @@ F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7 F test/altermalloc.test b341e6515fa6cd9f0ac5d19153c556c9add70be9 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0 F test/async.test 464dc7c7ccb144e8c82ecca429e6d7cd1c96bd6e -F test/async2.test 8f2c70b831dac7292450d0a42580cf2dab497dbb +F test/async2.test a8ef7abfda880b171b2f0a8476300816e33a808a F test/attach.test b849e1baae863c3a6132ff8b9b1baf356ab6c178 F test/attach2.test 78bc1a25ea8785c7571b44f5947ada2bd5d78127 F test/attach3.test eafcafb107585aecc2ed1569a77914138eef46a9 @@ -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 ab09967bd2dd291030850d44c0862fbb7d0d8118 -R b9c3cb63cea1b04e6323af6e1a9dc25c +P 41550d87c9395ab2fec5993655865e29235130a3 +R 0b029ad5b7a1a43fe250d3b514e5c065 U danielk1977 -Z e4e84e997e319c0541326d008ac33a40 +Z a4c62edaa5b493566de4c2f9f8f2604c diff --git a/manifest.uuid b/manifest.uuid index 9dd3065ceb..f3faf72349 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -41550d87c9395ab2fec5993655865e29235130a3 \ No newline at end of file +d80d87c239df06ef2182bc2b78e6d4c1852d28c9 \ No newline at end of file diff --git a/test/async2.test b/test/async2.test index bd69913b9f..2d938a657e 100644 --- a/test/async2.test +++ b/test/async2.test @@ -5,7 +5,7 @@ # #*********************************************************************** # -# $Id: async2.test,v 1.5 2007/08/25 12:39:29 danielk1977 Exp $ +# $Id: async2.test,v 1.6 2007/08/30 10:49:55 danielk1977 Exp $ set testdir [file dirname $argv0] @@ -47,11 +47,11 @@ set sql_script { db close -foreach err [list ioerr malloc] { +foreach err [list ioerr malloc-transient malloc-persistent] { set ::go 1 for {set n 1} {$::go} {incr n} { set ::sqlite_io_error_pending 0 - sqlite3_memdebug_fail -1 0 + sqlite3_memdebug_fail -1 file delete -force test.db test.db-journal sqlite3 db test.db execsql $::setup_script @@ -63,15 +63,16 @@ foreach err [list ioerr malloc] { db close switch -- $err { - ioerr { set ::sqlite_io_error_pending $n } - malloc { sqlite3_memdebug_fail $n 1 } + ioerr { set ::sqlite_io_error_pending $n } + malloc-persistent { sqlite3_memdebug_fail $n -repeat 1 } + malloc-transient { sqlite3_memdebug_fail $n -repeat 0 } } sqlite3async_halt idle sqlite3async_start sqlite3async_wait set ::sqlite_io_error_pending 0 - sqlite3_memdebug_fail -1 0 + sqlite3_memdebug_fail -1 sqlite3 db test.db set c [db eval {SELECT c FROM counter LIMIT 1}]