/ Check-in [16c164e7]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Require the SQLITE_ENABLE_INSTVFS symbol in order to compile testfixture with sqlite3_instvfs enabled. This allows fulltest to run on platforms for which we do not have a working hwtime.h (ex: ppc, s390). Change requested from the SuSE team. (CVS 5478)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 16c164e79c2033347a36d6f7150eb8d2e0497c78
User & Date: drh 2008-07-25 13:32:45
Context
2008-07-25
13:39
Increase limits on memsubsys1 tests to accomodate the larger structure sizes on 64-bit platforms. (CVS 5479) check-in: f7720f1b user: drh tags: trunk
13:32
Require the SQLITE_ENABLE_INSTVFS symbol in order to compile testfixture with sqlite3_instvfs enabled. This allows fulltest to run on platforms for which we do not have a working hwtime.h (ex: ppc, s390). Change requested from the SuSE team. (CVS 5478) check-in: 16c164e7 user: drh tags: trunk
12:49
Make the libtclsqlite3.la shared library depend on a separate libsqlite3.la shared library. I think this flies in the face of the whole SQLite philosophy of minimal dependencies, but on the other hand, few people use that shared library and the capability has been requested from the SuSE team. (CVS 5477) check-in: 83484b42 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/test_osinst.c.

    10     10   **
    11     11   ******************************************************************************
    12     12   **
    13     13   ** This file contains the implementation of an SQLite vfs wrapper that
    14     14   ** adds instrumentation to all vfs and file methods. C and Tcl interfaces
    15     15   ** are provided to control the instrumentation.
    16     16   **
    17         -** $Id: test_osinst.c,v 1.17 2008/07/12 15:55:55 danielk1977 Exp $
           17  +** $Id: test_osinst.c,v 1.18 2008/07/25 13:32:45 drh Exp $
    18     18   */
    19     19   
           20  +#ifdef SQLITE_ENABLE_INSTVFS
    20     21   /*
    21     22   ** C interface:
    22     23   **
    23     24   **   sqlite3_instvfs_create()
    24     25   **   sqlite3_instvfs_destroy()
    25     26   **   sqlite3_instvfs_configure()
    26     27   **
................................................................................
   805    806     pVfs = sqlite3_instvfs_create(zVfs, zParentVfs);
   806    807     if( pVfs ){
   807    808       sqlite3_instvfs_configure(pVfs, binarylog_xcall, p, binarylog_xdel);
   808    809     }
   809    810   
   810    811     return pVfs;
   811    812   }
          813  +#endif /* SQLITE_ENABLE_INSTVFS */
   812    814   
   813    815   /**************************************************************************
   814    816   ***************************************************************************
   815    817   ** Tcl interface starts here.
   816    818   */
   817    819   #if SQLITE_TEST
   818    820   
   819    821   #include <tcl.h>
   820    822   
          823  +#ifdef SQLITE_ENABLE_INSTVFS
   821    824   struct InstVfsCall {
   822    825     Tcl_Interp *interp;
   823    826     Tcl_Obj *pScript;
   824    827   };
   825    828   typedef struct InstVfsCall InstVfsCall;
   826    829   
   827    830   static void test_instvfs_xcall(
................................................................................
  1035   1038   
  1036   1039         break;
  1037   1040       }
  1038   1041     }
  1039   1042   
  1040   1043     return TCL_OK;
  1041   1044   }
         1045  +#endif /* SQLITE_ENABLE_INSTVFS */
         1046  +
         1047  +/* Alternative implementation of sqlite3_instvfs when the real
         1048  +** implementation is unavailable. 
         1049  +*/
         1050  +#ifndef SQLITE_ENABLE_INSTVFS
         1051  +static int test_sqlite3_instvfs(
         1052  +  void * clientData,
         1053  +  Tcl_Interp *interp,
         1054  +  int objc,
         1055  +  Tcl_Obj *CONST objv[]
         1056  +){
         1057  +  Tcl_AppendResult(interp, 
         1058  +     "not compiled with -DSQLITE_ENABLE_INSTVFS; sqlite3_instvfs is "
         1059  +     "unavailable", (char*)0);
         1060  +  return TCL_ERROR;
         1061  +}
         1062  +#endif /* !defined(SQLITE_ENABLE_INSTVFS) */
  1042   1063   
  1043   1064   int SqlitetestOsinst_Init(Tcl_Interp *interp){
  1044   1065     Tcl_CreateObjCommand(interp, "sqlite3_instvfs", test_sqlite3_instvfs, 0, 0);
  1045   1066     return TCL_OK;
  1046   1067   }
  1047   1068   
  1048         -#endif
         1069  +#endif /* SQLITE_TEST */