On instruction from DRH, only do malloc failure tests for O/S ops on non-Windows...

FossilOrigin-Name: e4aab150042bd22868ab02645151cb69a1c02ba0

diff --git a/manifest b/manifest
index e5063226fd8fc87ddff88743633f2dee666fa313..6be64d2cd9a795f79b2853d0e978ce53e008d0ed 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\sa\sslow-path\sin\sGetVarint32()\sfor\svarints\sthat\sdo\snot\sfit\sin\s32\sbits.\nThis\swill\sonly\shappen\swhen\strying\sto\sinterpret\sa\scorrupt\sdatabase\sfile\nso\sspeed\sis\snot\scritical.\s(CVS\s5129)
-D 2008-05-13T16:41:50
+C On\sinstruction\sfrom\sDRH,\sonly\sdo\smalloc\sfailure\stests\sfor\sO/S\sops\son\snon-Windows\ssystems.\s\sBetter\stest\sfixture\scode\swill\sbe\sintroduced\sin\s3.6.0\sto\sadd\sthis\scoverage\sback\sin\sfor\sWindows.\s(CVS\s5130)
+D 2008-05-13T19:41:54
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -115,7 +115,7 @@ F src/mutex.h 079fa6fe9da18ceb89e79012c010594c6672addb
 F src/mutex_os2.c 2911ea96955ab6cba734cc4ad903fe76f834b39e
 F src/mutex_unix.c 466d20378a0645fea64c3f2e2669c33b7802df56
 F src/mutex_w32.c 133698096a2c4e81cd11ea6f4de7891c66f7b9f7
-F src/os.c f9708b7ebd902fe6969fee5660a71d50e0244cad
+F src/os.c 10ec39461c53ded815d22f16f4bb0920c5561091
 F src/os.h 2ee8b0dec88f946c5371919ffa0f2fe4ac0de2e6
 F src/os_common.h e8b748b2f2ecc8a498e50bfe5d8721f189c19d2a
 F src/os_os2.c 0c3a5802bc4fdb7cb5f66771552b081c4e48a216
@@ -368,7 +368,7 @@ F test/lock4.test 09d97d52cae18fadfe631552af9880dac6b3ae90
 F test/main.test 82c222989e02ea09abd58d453828ffd71806b6bf
 F test/malloc.test fa208f99ed283b131ace2903f052375ab480de1a
 F test/malloc2.test 6f2abc0617a7df210381272681d598488a3bf943
-F test/malloc3.test b0bc1427574358f715e8d4379e16642089996703
+F test/malloc3.test 094f8195fe8e409bd4da0f1d769f7745faec62c8
 F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
 F test/malloc5.test 1a68e56e513eab54d8c4cd1b769ff1d14e3f99f4
 F test/malloc6.test 2f039d9821927eacae43e1831f815e157659a151
@@ -634,7 +634,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P a9d1d931358637a6f039723a053098f65530de4b
-R 435a83bf622f2e0c536254ba212845bb
-U drh
-Z da1263aed0eae79af41ab62d5e5b89fb
+P 6a6b9437367b66c3b6f710cf3abbdb9841765b21
+R c25ac8c50b83839e3cddbf23a801f9cb
+U shane
+Z 73678a053712b45b6a3efa873fe95580

diff --git a/manifest.uuid b/manifest.uuid
index 8c575dd334d3dacd03314f5eee06ab4b58d01437..1c22b6a2d097631d203275c645250efb62718431 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a6b9437367b66c3b6f710cf3abbdb9841765b21
\ No newline at end of file
+e4aab150042bd22868ab02645151cb69a1c02ba0
\ No newline at end of file

diff --git a/src/os.c b/src/os.c
index 7b0ea0474a816a443f7d8d22dd0a863811bef771..6429975c15657de241b94ecb13d840a682ce3495 100644 (file)
--- a/src/os.c
+++ b/src/os.c
@@ -34,7 +34,7 @@
 **     sqlite3OsLock()
 **
 */
-#ifdef SQLITE_TEST
+#if defined(SQLITE_TEST) && (OS_WIN==0)
   #define DO_OS_MALLOC_TEST if (1) {            \
     void *pTstAlloc = sqlite3_malloc(10);       \
     if (!pTstAlloc) return SQLITE_IOERR_NOMEM;  \

diff --git a/test/malloc3.test b/test/malloc3.test
index a04ba7ae532e6bef9c2358ffb902216e55604efc..67b190b8729dc832dc213d2c60f761b50d6a515f 100644 (file)
--- a/test/malloc3.test
+++ b/test/malloc3.test
@@ -13,7 +13,7 @@
 # correctly. The emphasis of these tests are the _prepare(), _step() and
 # _finalize() calls.
 #
-# $Id: malloc3.test,v 1.22 2008/05/13 13:27:34 drh Exp $
+# $Id: malloc3.test,v 1.23 2008/05/13 19:41:54 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -562,18 +562,15 @@ proc run_test {arglist iRepeat {pcstart 0} {iFailStart 1}} {
         set ::rollback_hook_count 0
 
         set ac [sqlite3_get_autocommit $::DB]        ;# Auto-Commit
-if {$iterid=="pc=4.iFail=44-sql"} breakpoint
         sqlite3_memdebug_fail $iFail -repeat 0
-#puts sql=[lindex $v 1]
         set rc [catch {db eval [lindex $v 1]} msg]   ;# True error occurs
-#puts "rc=$rc msg=$msg"
         set nac [sqlite3_get_autocommit $::DB]       ;# New Auto-Commit 
 
         if {$rc != 0 && $nac && !$ac} {
           # Before [db eval] the auto-commit flag was clear. Now it
           # is set. Since an error occured we assume this was not a
-         # commit - therefore a rollback occured. Check that the
-         # rollback-hook was invoked.
+          # commit - therefore a rollback occured. Check that the
+          # rollback-hook was invoked.
           do_test malloc3-rollback_hook.$iterid {
             set ::rollback_hook_count
           } {1}