Add testfixture command "vfs_current_time_int64". Returns the value returned by the...

FossilOrigin-Name: f79d5b1853b3d4316ea08de8206ffca33e44c395

diff --git a/manifest b/manifest
index fb4d5c08ebcfb2f78c0b4d89ad9dd241132bc54f..331799161ee4a68f951b277f2d7baa67eca7f969 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sshell\stool,\savoid\stesting\sif\s(sqlite3_vfs.xGetCurrentInt64)\sis\sNULL\sfor\sa\sversion\s1\sVFS.\sThis\sfield\sis\sonly\sdefined\sfor\sversion\s2\sand\sgreater.
-D 2015-11-16T08:54:10.841
+C Add\stestfixture\scommand\s"vfs_current_time_int64".\sReturns\sthe\svalue\sreturned\sby\sthe\sxCurrentTimeInt64\smethod\sof\sthe\sdefault\sVFS.
+D 2015-11-16T15:28:54.851
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -349,7 +349,7 @@ F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
-F src/test1.c 05df2a9e4f483b2fb642162209e3aeb11c24b44f
+F src/test1.c 4004bcc1b3b361a9137acd1d875599ecbdd6f961
 F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
 F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
 F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@ -1403,7 +1403,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 791761ebac26c82ab67bdf867117ec5b5d8b20b0
-R a635725b446415a63ce3c96185f06f0a
+P ad5fcaa583ef743d143b6c030e0d78019709fe71
+R bad7a2932fd1612d76a527d68176f4b8
 U dan
-Z ecc9df21b64c8edc0682f60d01379dbf
+Z d6f5979512fe258a491a417c706992f9

diff --git a/manifest.uuid b/manifest.uuid
index 19652556ca91614dd24236ca14c00b3f3586022e..6762a846fdc674f577bba1c25b8e86b78b053e6f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ad5fcaa583ef743d143b6c030e0d78019709fe71
\ No newline at end of file
+f79d5b1853b3d4316ea08de8206ffca33e44c395
\ No newline at end of file

diff --git a/src/test1.c b/src/test1.c
index 43feb2dc2d2e9eb28d502f3412525dc9541244f5..186e4e46846f3d07f18d8955cb26ff876fd6c943 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -2238,7 +2238,6 @@ static int test_config_sqllog(
   int objc,
   Tcl_Obj *CONST objv[]
 ){
-  sqlite3_stmt *pStmt;            /* First argument */
   if( objc!=1 ){
     Tcl_WrongNumArgs(interp, 1, objv, "");
     return TCL_ERROR;
@@ -2248,6 +2247,28 @@ static int test_config_sqllog(
 }
 #endif
 
+/*
+** Usage: vfs_current_time_int64
+**
+** Return the value returned by the default VFS's xCurrentTimeInt64 method.
+*/
+static int vfsCurrentTimeInt64(
+  void * clientData,
+  Tcl_Interp *interp,
+  int objc,
+  Tcl_Obj *CONST objv[]
+){
+  i64 t;
+  sqlite3_vfs *pVfs = sqlite3_vfs_find(0);
+  if( objc!=1 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "");
+    return TCL_ERROR;
+  }
+  pVfs->xCurrentTimeInt64(pVfs, &t);
+  Tcl_SetObjResult(interp, Tcl_NewWideIntObj(t));
+  return TCL_OK;
+}
+
 /*
 ** Usage:  sqlite3_next_stmt  DB  STMT
 **
@@ -7061,7 +7082,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
 #ifdef SQLITE_ENABLE_SQLLOG
      { "sqlite3_config_sqllog",         test_config_sqllog,   0 },
 #endif
-
+     { "vfs_current_time_int64",           vfsCurrentTimeInt64,   0 },
   };
   static int bitmask_size = sizeof(Bitmask)*8;
   static int longdouble_size = sizeof(LONGDOUBLE_TYPE);