Add the --vfs option to speedtest1.

FossilOrigin-Name: aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3

diff --git a/manifest b/manifest
index 50270d8b4003754dafc2578568355cfde599a25a..36bda4a2544210d0ddf3c4b4be85c65554e58186 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sdoc\stypo\sfix\sin\ssqlite.h.in.
-D 2022-10-02T20:13:46.207
+C Add\sthe\s--vfs\soption\sto\sspeedtest1.
+D 2022-10-03T13:45:03.604
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1480,7 +1480,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 8bf7ebac9ac316feed6656951249db531dc380c73fb3e3b22e224ffda96beff6
+F test/speedtest1.c 8a9f6b6f6b5b1a18739b9a2eca8dd3ad131f28946c14eb5ae33fefeeada466b7
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cd494240cc6184bb028d1f1049086f57c0a71a43d7ed1405fd4205240e1b9e61
-R 63d9c2979689d3960bbd738edf79070f
-U stephan
-Z 0ea9b225897586b46dcecb74f7edb744
+P 372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
+R bb0d587e0921cce1f37f5122ed804b2c
+U drh
+Z 3f01ed1217459ee72edb7ee3c272f0cd
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4b7393393e983c971f65db32e1fd6f9ac8995231..d991ba1f14eeae38af54b3103a77612d8a138cd9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-372802aaa22a830bf498bb0d9561ae02b32e5e191c4d7d771ea152140f6685a1
\ No newline at end of file
+aeb884029ac1c68f0d7361dda0a545cff19ed265b608c1e329a1926397c5c8a3
\ No newline at end of file

diff --git a/test/speedtest1.c b/test/speedtest1.c
index b115a57e2be6b6b3b7c3ca71544ae4a83827c817..c4ae8bdd5da185e034273eeb5890c3a4239df5b3 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -44,6 +44,7 @@ static const char zHelp[] =
   "  --utf16be           Set text encoding to UTF-16BE\n"
   "  --utf16le           Set text encoding to UTF-16LE\n"
   "  --verify            Run additional verification steps.\n"
+  "  --vfs NAME          Specify the VFS to use.\n"
   "  --without-rowid     Use WITHOUT ROWID where appropriate\n"
 ;
 
@@ -2184,6 +2185,7 @@ int main(int argc, char **argv){
   int doTrace = 0;              /* True for --trace */
   const char *zEncoding = 0;    /* --utf16be or --utf16le */
   const char *zDbName = 0;      /* Name of the test database */
+  const char *zVfs = 0;         /* VFS to use.  NULL means use the default */
 
   void *pHeap = 0;              /* Allocated heap space */
   void *pLook = 0;              /* Allocated lookaside space */
@@ -2357,6 +2359,9 @@ int main(int argc, char **argv){
         }else{
           g.zWR = "STRICT";
         }
+      }else if( strcmp(z,"vfs")==0 ){
+        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
+        zVfs = argv[++i];
       }else if( strcmp(z, "help")==0 || strcmp(z,"?")==0 ){
         printf(zHelp, argv[0]);
         exit(0);
@@ -2395,7 +2400,8 @@ int main(int argc, char **argv){
   sqlite3_initialize();
 
   /* Open the database and the input file */
-  if( sqlite3_open(memDb ? ":memory:" : zDbName, &g.db) ){
+  if( sqlite3_open_v2(memDb ? ":memory:" : zDbName, &g.db,
+                      SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, zVfs) ){
     fatal_error("Cannot open database file: %s\n", zDbName);
   }
 #if SQLITE_VERSION_NUMBER>=3006001