Minor test coverage enhancements. (CVS 4877)

FossilOrigin-Name: edd207b9a9df5d73ec34474a4e90fcb592f06cf1

diff --git a/manifest b/manifest
index 7f8baa66764fccd4f2e427b8cfbd49987731a5b1..dd0a459a1c4765eaa229fce7a35df00f43ab9294 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smemory\sleak\sintroduced\sby\sthe\sprevious\sbug\sfix.\s(CVS\s4876)
-D 2008-03-18T00:54:22
+C Minor\stest\scoverage\senhancements.\s(CVS\s4877)
+D 2008-03-18T13:01:38
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 5be94fea84f1599672e5041de03b97990baca593
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -105,7 +105,7 @@ F src/journal.c 807bed7a158979ac8d63953e1774e8d85bff65e2
 F src/legacy.c cb1939fdeb91ea88fb44fbd2768a10e14bc44650
 F src/limits.h 71ab25f17e35e0a9f3f6f234b8ed49cc56731d35
 F src/loadext.c eceaebcff9807519ed9494056648d0d879f93ed3
-F src/main.c 15db7dda6703f9a41a70337466215bf1a0e1fdcf
+F src/main.c 39fb36d59289a4c0f425bbde57a6d3d044b2fb9a
 F src/malloc.c 60e392a4c12c839517f9b0db7b995f825444fb35
 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
 F src/mem1.c fc716ff521b6dd3e43eaa211967383308800e70a
@@ -161,8 +161,8 @@ F src/test_config.c 9223ff4a7b8b97c9d12965b0123db1cbd6757efb
 F src/test_devsym.c cee1aecaa90c895030399ca4ae38f84a08038f8a
 F src/test_hexio.c 1a1cd8324d57585ea86b922f609fa1fbaaf9662d
 F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
-F src/test_malloc.c cdad54dc6a4152ba2681073cb21f74e76da95551
-F src/test_md5.c c107c96637123239c3518b5fbe97a79130f4d32e
+F src/test_malloc.c bba50714c0aa75552bc535473afb8213f18c2fe6
+F src/test_md5.c bca40b727c57462ddb415e57c5323445a1bb1a40
 F src/test_onefile.c 2fea6d22f13f5f286356c80c77ffd41f995f2b7a
 F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f
 F src/test_server.c a6ece6c835e7eae835054124e09e947e422b1ac5
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P d55a5e1c11ef90534abd2e5f18d06dd4739ade70
-R 8038a6869da25c8407656ca46ace7bfe
+P b9c5dce34985f7e6d1b6314ae8674f07d0bf518b
+R 67aaf9a613e3c2a3d49f99caa50102da
 U drh
-Z 08840e24e9d36f24a7b459d649a2a623
+Z 4730a7cecf64579e388237eb2277c2bb

diff --git a/manifest.uuid b/manifest.uuid
index 3d47a4bb2c17e01a240d291c214f7dbdeaf016ef..91d9502c8d86baef2f7034704ef0c62f70102eca 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b9c5dce34985f7e6d1b6314ae8674f07d0bf518b
\ No newline at end of file
+edd207b9a9df5d73ec34474a4e90fcb592f06cf1
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 7b12c4415865667ad01c15fee867fe5f89a1ceec..12806b0a79b9321103be91fdf1dec3cecf04da33 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.421 2008/03/07 21:37:19 drh Exp $
+** $Id: main.c,v 1.422 2008/03/18 13:01:38 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1002,13 +1002,12 @@ static int openDatabase(
   createCollation(db, "BINARY", SQLITE_UTF16BE, 0, binCollFunc, 0);
   createCollation(db, "BINARY", SQLITE_UTF16LE, 0, binCollFunc, 0);
   createCollation(db, "RTRIM", SQLITE_UTF8, (void*)1, binCollFunc, 0);
-  if( db->mallocFailed ||
-      (db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "BINARY", 6, 0))==0 
-  ){
-    assert( db->mallocFailed );
+  if( db->mallocFailed ){
     db->magic = SQLITE_MAGIC_SICK;
     goto opendb_out;
   }
+  db->pDfltColl = sqlite3FindCollSeq(db, SQLITE_UTF8, "BINARY", 6, 0);
+  assert( db->pDfltColl!=0 );
 
   /* Also add a UTF-8 case-insensitive collation sequence. */
   createCollation(db, "NOCASE", SQLITE_UTF8, 0, nocaseCollatingFunc, 0);

diff --git a/src/test_malloc.c b/src/test_malloc.c
index 38708009afbcc8aaed96819711cf8ae2ceb5e13e..c0daf46908bed7b537a5a8beed5d286bfa5a5c76 100644 (file)
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -13,7 +13,7 @@
 ** This file contains code used to implement test interfaces to the
 ** memory allocation subsystem.
 **
-** $Id: test_malloc.c,v 1.16 2008/03/18 00:07:11 drh Exp $
+** $Id: test_malloc.c,v 1.17 2008/03/18 13:01:38 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -437,6 +437,7 @@ static int test_memdebug_fail(
     }
   }
   
+  sqlite3_test_control(-12345); /* Just to stress the test_control interface */
   nBenign = sqlite3_test_control(SQLITE_TESTCTRL_FAULT_BENIGN_FAILURES,
                                  SQLITE_FAULTINJECTOR_MALLOC);
   nFail = sqlite3_test_control(SQLITE_TESTCTRL_FAULT_FAILURES,

diff --git a/src/test_md5.c b/src/test_md5.c
index 792fc8598a0e94ba28493ace8f5ef4e98ab47ea9..f3613d0015ccdb7caaf708986716a86d9e7d82e7 100644 (file)
--- a/src/test_md5.c
+++ b/src/test_md5.c
@@ -383,6 +383,8 @@ static void md5finalize(sqlite3_context *context){
   sqlite3_result_text(context, zBuf, -1, SQLITE_TRANSIENT);
 }
 int Md5_Register(sqlite3 *db){
-  return sqlite3_create_function(db, "md5sum", -1, SQLITE_UTF8, 0, 0, 
+  int rc = sqlite3_create_function(db, "md5sum", -1, SQLITE_UTF8, 0, 0, 
                                  md5step, md5finalize);
+  sqlite3_overload_function(db, "md5sum", -1);  /* To exercise this API */
+  return rc;
 }