diff options
| -rw-r--r-- | manifest | 16 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | test/corrupt2.test | 8 | ||||
| -rw-r--r-- | test/shared_err.test | 19 |
4 files changed, 21 insertions, 24 deletions
@@ -1,5 +1,5 @@ -C When\ssqlite3_create_collation\sis\scalled\swith\san\sinvalid\sencoding,\sreturn\nSQLITE_MISUSE.\s(CVS\s5354) -D 2008-07-07T17:53:08 +C Fix\sa\sproblem\sin\sshared_err.test\spreventing\sit\sfrom\srunning\sproperly\sand\sadd\sa\stest\sto\scorrupt2.test\sto\scover\sanother\scorruption\sdetection\scase.\s(CVS\s5355) +D 2008-07-07T17:55:29 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -242,7 +242,7 @@ F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6 F test/colmeta.test 087c42997754b8c648819832241daf724f813322 F test/conflict.test bb29b052c60a1f7eb6382be77902061d1f305318 F test/corrupt.test af069d971853dbe12af936910bfa49d92f7b16e9 -F test/corrupt2.test 056c97ae3144e309f22dd6a6b4a6abae9e56d5b2 +F test/corrupt2.test 33c154628676f494bf4e7dd2c976115ed59a632d F test/corrupt3.test 263e8bb04e2728df832fddf6973cf54c91db0c32 F test/corrupt4.test acdb01afaedf529004b70e55de1a6f5a05ae7fff F test/corrupt5.test 7796d5bdfe155ed824cee9dff371f49da237cfe0 @@ -455,7 +455,7 @@ F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c F test/shared.test c6769531e0cb751d46a9838c0532d3786606c0f6 F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4 F test/shared3.test 987316be601e2349e6a340a6d5f8ed981e507931 -F test/shared_err.test 954e1c29d7415e19c95787297462254eee40ca7e +F test/shared_err.test 776ab7196ecda8b07a075e115b0725806991e151 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/sidedelete.test 736ac1da08b3b1aa62df97fef2fcdb1b660111b9 F test/soak.test 64f9b27fbcdec43335a88c546ce1983e6ba40d7b @@ -598,7 +598,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P acfb2b41ae66307ba80b6245aced9cc1d8092189 -R 847cfc5b52ddb522dcd4cc35ae7605db -U drh -Z 70baa66de932a9ed85bb20bf469edd2a +P eae4105d8a162ba80ca6fde40ae24fdc6c3eccdf +R f496c8d0640042a91d4ade70336ad198 +U danielk1977 +Z 30d3aab86bc5b9f928dd05214faf5bdf diff --git a/manifest.uuid b/manifest.uuid index ed4e8becc..b7eb689c1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eae4105d8a162ba80ca6fde40ae24fdc6c3eccdf
\ No newline at end of file +2dcd5287a0d71140baa23aae2ab3d95d78a5676d
\ No newline at end of file diff --git a/test/corrupt2.test b/test/corrupt2.test index 31dcbb197..b3ff567f1 100644 --- a/test/corrupt2.test +++ b/test/corrupt2.test @@ -13,7 +13,7 @@ # This file implements tests to make sure SQLite does not crash or # segfault if it sees a corrupt database file. # -# $Id: corrupt2.test,v 1.7 2008/07/07 17:04:23 danielk1977 Exp $ +# $Id: corrupt2.test,v 1.8 2008/07/07 17:55:29 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -172,6 +172,12 @@ do_test corrupt2-3.1 { } {1 {database disk image is malformed}} do_test corrupt2-4.1 { + catchsql { + SELECT * FROM t2; + } db2 +} {1 {database disk image is malformed}} + +do_test corrupt2-4.1 { file delete -force corrupt.db file delete -force corrupt.db-journal sqlite3 db2 corrupt.db diff --git a/test/shared_err.test b/test/shared_err.test index 457c987e5..95e8c900a 100644 --- a/test/shared_err.test +++ b/test/shared_err.test @@ -13,7 +13,7 @@ # cache context. What happens to connection B if one connection A encounters # an IO-error whilst reading or writing the file-system? # -# $Id: shared_err.test,v 1.20 2008/07/07 14:56:57 danielk1977 Exp $ +# $Id: shared_err.test,v 1.21 2008/07/07 17:55:29 danielk1977 Exp $ proc skip {args} {} @@ -291,17 +291,6 @@ do_ioerr_test shared_ioerr-3rev -tclprep { db2 close } -# Only run these tests if memory debugging is turned on. -# -ifcapable !memdebug { - puts "Skipping tests shared_err-4 through -9:\ - not compiled with -DSQLITE_MEMDEBUG..." - db close - sqlite3_enable_shared_cache $::enable_shared_cache - finish_test - return -} - # Provoke a malloc() failure when a cursor position is being saved. This # only happens with index cursors (because they malloc() space to save the # current key value). It does not happen with tables, because an integer @@ -416,7 +405,7 @@ do_malloc_test shared_err-8 -tclprep { set res [catchsql {SELECT a FROM t1} db2] set ans [lindex $res 1] if {[lindex $res 0]} { - set r [expr {$ans=="disk I/O error"}] + set r [expr {$ans=="disk I/O error" || $ans=="out of memory"}] } else { set r [expr {[lrange $ans 0 1]=="0000000000 1111111111"}] } @@ -441,7 +430,6 @@ do_test shared_malloc-8.X { expr $::aborted>=1 } {1} - # This test is designed to catch a specific bug that was present during # development of 3.5.0. If a malloc() failed while setting the page-size, # a buffer (Pager.pTmpSpace) was being freed. This could cause a seg-fault @@ -499,6 +487,9 @@ do_malloc_test shared_err-11 -tclprep { execsql { SELECT * FROM sqlite_master } } +catch {db close} +catch {db2 close} + do_malloc_test shared_err-12 -sqlbody { CREATE TABLE abc(a, b, c); INSERT INTO abc VALUES(1, 2, 3); |