From: drh <>
Date: Wed, 14 Aug 2024 14:12:31 +0000 (+0000)
Subject: More incremental improvements to the iotester program.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e52bd70e026f4f0c5cba08621c59ef1d7f670365;p=thirdparty%2Fsqlite.git

More incremental improvements to the iotester program.

FossilOrigin-Name: 30a383fc3d49eb50b121446703daa6022af673f08f1347e84f0f10644168eab9
---

diff --git a/manifest b/manifest
index e8f27664fa..96145d9153 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\simprovements\sto\sthe\snew\siotester\sprogram.
-D 2024-08-14T13:31:02.032
+C More\sincremental\simprovements\sto\sthe\siotester\sprogram.
+D 2024-08-14T14:12:31.366
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1337,7 +1337,7 @@ F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 5984da7bf74b6540aa356f2ab0c6ae68a6d12039a3d798a9ac6a100abc17d520
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
-F test/iotester.c 3735662f1a0b66da098f4e3a50a92fb26210d8f7b74f05133cc01d6e2514c4fe
+F test/iotester.c 2f1e2197506aa661324f40619807fe2c46447e791fa2a33e3062b5074509e2f1
 F test/istrue.test e7f285bb70282625c258e866ce6337d4c762922f5a300e1b50f958aef6e7d9c9
 F test/join.test f7abfef3faeaf2800308872e33a57e5b6e4a2b44fb8c6b90c6068412e71a6cf4
 F test/join2.test 8561fe82ce434ac96de91544072e578dc2cadddf2d9bc9cd802f866a9b92502e
@@ -2205,8 +2205,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 96df5aa656a9dd14a8b7ab27de7ec9b7614be44131edd890f15046ac7df03ff1
-R 1443e09b4bb882e9ec1004e4b30402ea
+P dd71dde5477a8b3e177ce0255ba0845ece92fa34f4bf23c09e45d2e06f51d3d3
+R aba7335a4c3d685a24835a5758790adb
 U drh
-Z c12c6fe7c703af18c45a4f6c75d6c1b6
+Z 6129bd7588ff33b3aa37a3efbdb15a4e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7fc05179f4..70861ac0e2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dd71dde5477a8b3e177ce0255ba0845ece92fa34f4bf23c09e45d2e06f51d3d3
+30a383fc3d49eb50b121446703daa6022af673f08f1347e84f0f10644168eab9
diff --git a/test/iotester.c b/test/iotester.c
index 61c4183958..f7cae140f6 100644
--- a/test/iotester.c
+++ b/test/iotester.c
@@ -49,12 +49,8 @@ struct IOTester {
 
 
 /* Forward declarations of subroutines and functions. */
-void iotestError(IOTester*,const char *zFormat, ...);
-sqlite3 *iotestOpenDb(IOTester*,const char *zDbName);
-void iotestUnlink(IOTester *p, const char *zFilename);
-void iotestBeginTest(IOTester *p, int iTestnum);
-
-
+static void iotestError(IOTester*,const char *zFormat, ...);
+static void iotestBeginTest(IOTester *p, int iTestnum);
 static void iotestBasic1(IOTester*);
 static void iotestBasic2(IOTester*);
 
@@ -941,8 +937,9 @@ sqlite3 *iotestOpen(IOTester *p, const char *zDbFilename){
     if( p->isExclusive ){
       iotestRun(p, db, "PRAGMA locking_mode=EXCLUSIVE;");
     }
-    iotestRun(p, db, "PRAGMA cache_size=2;");
   }
+  iotestRun(p, db, "PRAGMA cache_size=2;");
+  iotestRun(p, db, "PRAGMA temp_store=FILE;");
   sha3Register(db);
   stmtrandRegister(db);
   return db;
@@ -1039,10 +1036,6 @@ basic2_exit:
 **
 ** Any customizations that need to be made to port this test program to
 ** new platforms are made below this point.
-**
-** These functions access the filesystem directly or make other system
-** interactions that are non-portable.  Modify these routines as necessary
-** to work on alternative operating systems.
 */
 #include <stdio.h>
 
@@ -1050,7 +1043,7 @@ basic2_exit:
 ** Start a new test case.  (This is under the "Out-of-band" section because
 ** of its optional use of printf().)
 */
-void iotestBeginTest(IOTester *p, int iTN){
+static void iotestBeginTest(IOTester *p, int iTN){
   p->iTestNum = iTN;
   p->nTest++;
   if( p->eVerbosity>=2 ) printf("%s-%d\n", p->zTestModule, iTN);
@@ -1083,6 +1076,8 @@ int main(int argc, char **argv){
      0, 2097152, 2147483648
   };
 
+
+
   memset(&x, 0, sizeof(x));
 
   /* Process command-line arguments */