From: drh <drh@noemail.net>
Date: Mon, 24 May 2010 12:34:14 +0000 (+0000)
Subject: Fix up test_osinst.c to work with SQLITE_OMIT_VIRTUALTABLE.
X-Git-Tag: version-3.7.2~346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00f699d57b3acf699dc300ae1830ee796f321b1d;p=thirdparty%2Fsqlite.git

Fix up test_osinst.c to work with SQLITE_OMIT_VIRTUALTABLE.

FossilOrigin-Name: 51fd38152b92db637d1d346fca35ec2d3e4d4f57
---

diff --git a/manifest b/manifest
index 64f003858f..c56961a9a6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Change\sthe\sWAL\sfile\sformat\sto\ssupport\stwo\skinds\sof\schecksums\s-\sone\sthat\sis\sfast\sto\scalculate\son\slittle-endian\sarchitectures\sand\sanother\sthat\sis\sfast\son\sbig-endian\sarchitectures.\sA\sflag\sin\sthe\swal-header\sindicates\swhich\sthe\sfile\suses.
-D 2010-05-24T10:39:36
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Fix\sup\stest_osinst.c\sto\swork\swith\sSQLITE_OMIT_VIRTUALTABLE.
+D 2010-05-24T12:34:15
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -201,7 +204,7 @@ F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 2842c922b8e8d992aba722214952204ca025b411
 F src/test_mutex.c ce06b59aca168cd8c520b77159a24352a7469bd3
 F src/test_onefile.c 4ce8c753c0240f010f0f2af89604875967d20945
-F src/test_osinst.c 77e9fc304bc9c825fb4b6c7e396d4d3f23c101b4
+F src/test_osinst.c 18b342b0979a78788af91e6b48b0fdcf0c4b340c
 F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
@@ -814,7 +817,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 5c9e9c06ae350043e66f36087da4021a52e6ee17
-R 7dee910e14836a9af936b980d0803808
-U dan
-Z e618b798a3fca06f0d820ccfd6fdc7f4
+P 65ba804dd1d31d1eef6ae3f40a3ade344a410b84
+R 0975a148083609eb5447373024159739
+U drh
+Z 8f7b7419862e6cd292f6daada9d7ada1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFL+nJKoxKgR168RlERAjScAJ4/8ZhDAE/GBBAXcCDhuFrHs7q9jACeJ+Ai
+97pW8OvIMPU2UcYdSr30juc=
+=5VIs
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 9cd53f261d..4bbc2d30b0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65ba804dd1d31d1eef6ae3f40a3ade344a410b84
\ No newline at end of file
+51fd38152b92db637d1d346fca35ec2d3e4d4f57
\ No newline at end of file
diff --git a/src/test_osinst.c b/src/test_osinst.c
index f55611d4f6..6697fa1ecd 100644
--- a/src/test_osinst.c
+++ b/src/test_osinst.c
@@ -877,6 +877,7 @@ static void dequote(char *z){
   }
 }
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
 /*
 ** Connect to or create a vfslog virtual table.
 */
@@ -1115,7 +1116,7 @@ int sqlite3_vfslog_register(sqlite3 *db){
   sqlite3_create_module(db, "vfslog", &vfslog_module, 0);
   return SQLITE_OK;
 }
-
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
 
 /**************************************************************************
 ***************************************************************************
@@ -1210,17 +1211,23 @@ static int test_vfslog(
         Tcl_WrongNumArgs(interp, 2, objv, "DB");
         return TCL_ERROR;
       }
+#ifdef SQLITE_OMIT_VIRTUALTABLE
+      Tcl_AppendResult(interp, "vfslog not available because of "
+                               "SQLITE_OMIT_VIRTUALTABLE", (void*)0);
+      return TCL_ERROR;
+#else
       zDb = Tcl_GetString(objv[2]);
       if( Tcl_GetCommandInfo(interp, zDb, &cmdInfo) ){
         db = ((struct SqliteDb*)cmdInfo.objClientData)->db;
         rc = sqlite3_vfslog_register(db);
       }
       if( rc!=SQLITE_OK ){
-        Tcl_AppendResult(interp, "Bad sqlite3 handle: ", zDb, 0);
+        Tcl_AppendResult(interp, "bad sqlite3 handle: ", zDb, (void*)0);
         return TCL_ERROR;
       }
       break;
-    };
+#endif
+    }
   }
 
   return TCL_OK;