Make the "mix1" testset the default for speedtest1.

FossilOrigin-Name: 7a0c3d0e14984dd49a7c1e824b9e50564094ad57c43182bfec7624a55815f961

diff --git a/manifest b/manifest
index 8a2dd3ba4328736a0d13dd00e58bf09122908d41..f647110054ac50ee992190f483aac05abdfa3e4a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sspeedtest1\swith\sa\snew\stestset\sthat\scalls\ssqlite3_open()\sand\suses\sthe\nconnection\smany\stimes.
-D 2025-02-10T16:13:56.580
+C Make\sthe\s"mix1"\stestset\sthe\sdefault\sfor\sspeedtest1.
+D 2025-02-10T16:34:30.128
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -1681,7 +1681,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
 F test/speedtest.md ee958457ae1b729d9715ae33c0320600000bf1d9ddea1a88dcf79f56729d6fad
 F test/speedtest.tcl 185f80f8db275852746e8150137b31ba4aaa1c9a1ecb1e35a3b66cd3f31783b9 x
-F test/speedtest1.c abcce434642f8f1e1be530d25d8e7d7862360236d7a8e4f626521bc3263bd38c
+F test/speedtest1.c 132cd5ba064f48910bb4b68337442b0ef419218c8de9e9855f66d98015286ddb
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -2209,8 +2209,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 44b4e4db321815c6fc0327ed7b97df868833654411e882b70f54ad3f6d212987
-R 6770e3052628a73d65a1abe270e15306
+P ce307addb0c7cf72e4cca066521df6e15d1220bce303a3796a794a2ae5fa95b3
+R 7ff52f027efda91f136a0ad19e93519e
 U drh
-Z b145be6a514a8b9ab22ab7f6982431ae
+Z 3d75c6193c4df011902dd598934d5c2c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 2351f8f43892450891dc508a58b0baf9cdded128..be6b3b23b4df1ae02f23e7adffc558e3aaea5a1f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ce307addb0c7cf72e4cca066521df6e15d1220bce303a3796a794a2ae5fa95b3
+7a0c3d0e14984dd49a7c1e824b9e50564094ad57c43182bfec7624a55815f961

diff --git a/test/speedtest1.c b/test/speedtest1.c
index a03bdbb73b9a22b28dccf22f0e89dcdcb5920f3c..b49c70098fc3781d88aab1a216dea0840cf27166 100644 (file)
--- a/test/speedtest1.c
+++ b/test/speedtest1.c
@@ -2960,7 +2960,7 @@ int main(int argc, char **argv){
   int memDb = 0;                /* --memdb.  Use an in-memory database */
   int openFlags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE
     ;                           /* SQLITE_OPEN_xxx flags. */
-  char *zTSet = "main";         /* Which --testset torun */
+  char *zTSet = "mix1";         /* Which --testset torun */
   int doTrace = 0;              /* True for --trace */
   const char *zEncoding = 0;    /* --utf16be or --utf16le */
 
@@ -2971,6 +2971,10 @@ int main(int argc, char **argv){
   int i;                        /* Loop counter */
   int rc;                       /* API return code */
 
+  /* "mix1" is a macro testset: */
+  static char zMix1Tests[] =
+         "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10,star,app";
+
 #ifdef SQLITE_SPEEDTEST1_WASM
   /* Resetting all state is important for the WASM build, which may
   ** call main() multiple times. */
@@ -3116,11 +3120,8 @@ int main(int argc, char **argv){
         }
         g.eTemp = argv[i][0] - '0';
       }else if( strcmp(z,"testset")==0 ){
-        static char zMix1Tests[] =
-            "main,orm/25,cte/20,json,fp/3,parsenumber/25,rtree/10,star,app";
         ARGC_VALUE_CHECK(1);
         zTSet = argv[++i];
-        if( strcmp(zTSet,"mix1")==0 ) zTSet = zMix1Tests;
       }else if( strcmp(z,"trace")==0 ){
         doTrace = 1;
       }else if( strcmp(z,"threads")==0 ){
@@ -3272,6 +3273,7 @@ int main(int argc, char **argv){
   }
 
   if( g.bExplain ) printf(".explain\n.echo on\n");
+  if( strcmp(zTSet,"mix1")==0 ) zTSet = zMix1Tests;
   do{
     char *zThisTest = zTSet;
     char *zSep;