Compile in test code whenever -DSQLITE_TEST=1 is present. Do not rely

on -DSQLITE_DEBUG=1 because somebody might try to run the tests without it. (CVS 3349)

FossilOrigin-Name: 867defe32873ce82b6e1f5ddb8ad12178f2d76d6

diff --git a/manifest b/manifest
index d20a861b945fdf6096dbbdd99b54d4a422501490..fdcb07634375ead326bc3754695a1348ca64fc26 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.3.7\s(CVS\s3348)
-D 2006-08-12T14:42:58
+C Compile\sin\stest\scode\swhenever\s-DSQLITE_TEST=1\sis\spresent.\s\sDo\snot\srely\non\s-DSQLITE_DEBUG=1\sbecause\ssomebody\smight\stry\sto\srun\sthe\stests\swithout\sit.\s(CVS\s3349)
+D 2006-08-13T18:39:26
 F Makefile.in 9c2a76055c305868cc5f5b73e29a252ff3632c0a
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -28,13 +28,13 @@ F publish.sh 0803a2952107454d3eaf2e239bd6699951ecfbab
 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
-F sqlite3.def f756049b1bf3e8442baf6862db393ca423225262
+F sqlite3.def 1769dc61f40c11e724f223ec675130b23115681b
 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a
 F src/alter.c eba661e77bfd00282fbfa316cdb6aef04856fedc
 F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a
 F src/attach.c b11eb4d5d3fb99a10a626956bccc7215f6b68b16
 F src/auth.c 902f4722661c796b97f007d9606bd7529c02597f
-F src/btree.c c4757940df58fc0914d2c4f1778a66101df2c6b9
+F src/btree.c b39b7147d400b4906a48850b83d22b0c2a641007
 F src/btree.h 061c50e37de7f50b58528e352d400cf33ead7418
 F src/build.c 2ea8ad0e2e49b3957692588182524e6c390ab5a9
 F src/callback.c fd9bb39f7ff6b52bad8365617abc61c720640429
@@ -79,7 +79,7 @@ F src/table.c d8817f43a6c6bf139487db161760b9e1e02da3f1
 F src/tclsqlite.c 92a997ee5caca4923a6452ff8ebfaa8d37334f4a
 F src/test1.c 535294d7f21a4127082c4f7a57f225482df9cc36
 F src/test2.c ca74a1d8aeb7d9606e8f6b762c5daf85c1a3f92b
-F src/test3.c 833dc8346e431182ae6bd0648455c3d4cc65a19f
+F src/test3.c 85135c09560c48bdb0a23c9b890ab405486b8ec9
 F src/test4.c 8b784cd82de158a2317cb4ac4bc86f91ad315e25
 F src/test5.c 7162f8526affb771c4ed256826eee7bb9eca265f
 F src/test6.c 60a02961ceb7b3edc25f5dc5c1ac2556622a76de
@@ -377,7 +377,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P c276cca2aafc1b417e12ba7119c65902ef7d61ec
-R 020f98eb0b5ebf9cf9f7532c7acdc3ce
+P 85434a4b96389359a15556551cdc72259fc505e8
+R a059c4b4cac6c1b282cab53f8fba2604
 U drh
-Z 7ca726032be8e54e9c6e86afac4be4ee
+Z be0950499a88a5bf353c223f4acee36d

diff --git a/manifest.uuid b/manifest.uuid
index 9a14196045f6ee159987be1aee271307384bdf1f..7e11ce2800002146c7d6aad5de09d50ae45e0756 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-85434a4b96389359a15556551cdc72259fc505e8
\ No newline at end of file
+867defe32873ce82b6e1f5ddb8ad12178f2d76d6
\ No newline at end of file

diff --git a/sqlite3.def b/sqlite3.def
index e42a0cd3d6bcb2c00fcf33e352b60840fceef8fb..f390f42f4a5a78b1a94581f325c294352865961e 100644 (file)
--- a/sqlite3.def
+++ b/sqlite3.def
@@ -40,6 +40,7 @@ sqlite3_create_function
 sqlite3_create_function16
 sqlite3_data_count
 sqlite3_db_handle
+sqlite3_enable_load_extension
 sqlite3_enable_shared_cache
 sqlite3_errcode
 sqlite3_errmsg
@@ -57,6 +58,7 @@ sqlite3_interrupt
 sqlite3_last_insert_rowid
 sqlite3_libversion
 sqlite3_libversion_number
+sqlite3_load_extension
 sqlite3_mprintf
 sqlite3_open
 sqlite3_open16

diff --git a/src/btree.c b/src/btree.c
index 181a0adebc56827644600d4357bfbe88a76b3a45..25306cf37af9c154fbb7f8d3b0e0c94dc5fa21cf 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.326 2006/08/08 13:51:43 drh Exp $
+** $Id: btree.c,v 1.327 2006/08/13 18:39:26 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** For a detailed discussion of BTrees, refer to
@@ -2548,7 +2548,7 @@ static int countWriteCursors(BtShared *pBt){
 }
 #endif
 
-#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG)
+#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
 /*
 ** Print debugging information about all cursors to standard output.
 */
@@ -5969,7 +5969,7 @@ int sqlite3BtreePageDump(Btree *p, int pgno, int recursive){
 }
 #endif
 
-#if defined(SQLITE_TEST) && defined(SQLITE_DEBUG)
+#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
 /*
 ** Fill aResult[] with information about the entry and page that the
 ** cursor is pointing to.

diff --git a/src/test3.c b/src/test3.c
index 3d4c086f24f3075d13c2d8f941279c67354672de..d982380408b7637696667d17c7711da6a570487c 100644 (file)
--- a/src/test3.c
+++ b/src/test3.c
@@ -13,7 +13,7 @@
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test3.c,v 1.66 2006/06/26 21:35:46 drh Exp $
+** $Id: test3.c,v 1.67 2006/08/13 18:39:26 drh Exp $
 */
 #include "sqliteInt.h"
 #include "pager.h"
@@ -598,7 +598,6 @@ static int btree_integrity_check(
 **
 ** Print information about all cursors to standard output for debugging.
 */
-#ifdef SQLITE_DEBUG
 static int btree_cursor_list(
   void *NotUsed,
   Tcl_Interp *interp,    /* The TCL interpreter that invoked this command */
@@ -616,7 +615,6 @@ static int btree_cursor_list(
   sqlite3BtreeCursorList(pBt);
   return SQLITE_OK;
 }
-#endif
 
 /*
 ** Usage:   btree_cursor ID TABLENUM WRITEABLE
@@ -1187,7 +1185,6 @@ static int btree_payload_size(
 **   aResult[8] =  Local payload size
 **   aResult[9] =  Parent page number
 */
-#ifdef SQLITE_DEBUG
 static int btree_cursor_info(
   void *NotUsed,
   Tcl_Interp *interp,    /* The TCL interpreter that invoked this command */
@@ -1225,7 +1222,6 @@ static int btree_cursor_info(
   Tcl_AppendResult(interp, &zBuf[1], 0);
   return SQLITE_OK;
 }
-#endif
 
 /*
 ** The command is provided for the purpose of setting breakpoints.
@@ -1441,10 +1437,8 @@ int Sqlitetest3_Init(Tcl_Interp *interp){
      { "btree_rollback_statement", (Tcl_CmdProc*)btree_rollback_statement },
      { "btree_from_db",            (Tcl_CmdProc*)btree_from_db            },
      { "btree_set_cache_size",     (Tcl_CmdProc*)btree_set_cache_size     },
-#ifdef SQLITE_DEBUG
      { "btree_cursor_info",        (Tcl_CmdProc*)btree_cursor_info        },
      { "btree_cursor_list",        (Tcl_CmdProc*)btree_cursor_list        },
-#endif
   };
   int i;