Show ETC in fuzzcheck with the --spinner option when there is only one input

file.

FossilOrigin-Name: 809699aeaaa4bae67e7ddeae3d42c7133f7deadbb4eb869cfb7e99dd97bdea99

diff --git a/manifest b/manifest
index 04000a5492c61d6e210894fad466f3a96ae92111..83b9298fd6b61cedbb5e4fa9cebe4048c955c9a3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sthe\ssubstr()\sSQL\sfunction\sso\sthat\sit\scan\shandle\sridiculously\slarge\nnumbers\sin\sits\s2nd\sand\s3rd\sarguments\swithout\ssigned\sinteger\soverflows.
-D 2024-12-28T12:32:01.085
+C Show\sETC\sin\sfuzzcheck\swith\sthe\s--spinner\soption\swhen\sthere\sis\sonly\sone\sinput\nfile.
+D 2024-12-28T13:04:31.448
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -1274,7 +1274,7 @@ F test/fuzz3.test 70ba57260364b83e964707b9d4b5625284239768ab907dd387c740c0370ce3
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 89b71d92b150a532e945e489d6e0721a4b15353c9255e079c198ed2a1958018b
+F test/fuzzcheck.c 1671559091b3e134ec807490f624d306b24bd9a8f03b12aa97e292f4b31e5d96
 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -2202,8 +2202,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 286559dfb3ad01fcf34360991a108dbe6bf81e7919c461ada6c691ee8f43868f
-R 6fd56d72396565e46db9a7e82d5a2906
+P c1de8f916ea617109a903c436c57d082756fbb2b933ba9ce6998b9b912b12dea
+R c040710ee01619bb4db43dcfabab289e
 U drh
-Z 2ed81eb220ab467fd47b108b1040a471
+Z 7ae0fec8e974918548c014471849b63b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7b634f43410fe9fea865f8ccfc746702dbf4bdf1..9d76ba40030838dee70a67159e2680c85c605f9c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1de8f916ea617109a903c436c57d082756fbb2b933ba9ce6998b9b912b12dea
+809699aeaaa4bae67e7ddeae3d42c7133f7deadbb4eb869cfb7e99dd97bdea99

diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index 9f339096bc49744951e80447f460036408a7352c..390d804df12be49a15020e76d77231978c6b536b 100644 (file)
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -1917,6 +1917,7 @@ int main(int argc, char **argv){
   int bTimer = 0;              /* Show elapse time for each test */
   int nV;                      /* How much to increase verbosity with -vvvv */
   sqlite3_int64 tmStart;       /* Start of each test */
+  int iEstTime = 0;            /* LPF for the time-to-go */
 
   sqlite3_config(SQLITE_CONFIG_URI,1);
   registerOomSimulator();
@@ -2416,9 +2417,29 @@ int main(int argc, char **argv){
         if( bScript ){
           /* No progress output */
         }else if( bSpinner ){
-          int nTotal =g.nSql;
+          int nTotal = g.nSql;
           int idx = pSql->seq;
-          printf("\r%s: %d/%d   ", zDbName, idx, nTotal);
+          if( nSrcDb==1 && nTotal>idx && idx>=20 ){
+            int iToGo = (timeOfDay() - iBegin)*(nTotal-idx)/(idx*1000);
+            int hr, min, sec;
+            if( idx==20 ){
+              iEstTime = iToGo;
+            }else{
+              iEstTime = (iToGo + 7*iEstTime)/8;
+            }
+            hr = iEstTime/3600;
+            min = (iEstTime/60)%60;
+            sec = iEstTime%60;
+            if( hr>0 ){
+              printf("\r%s: %d/%d ETC %d:%02d:%02d  ",
+                     zDbName, idx, nTotal, hr, min, sec);
+            }else{
+              printf("\r%s: %d/%d ETC %02d:%02d    ",
+                     zDbName, idx, nTotal, min, sec);
+            }
+          }else{  
+            printf("\r%s: %d/%d           ", zDbName, idx, nTotal);
+          }
           fflush(stdout);
         }else if( verboseFlag>1 ){
           printf("%s\n", g.zTestName);
@@ -2457,7 +2478,7 @@ int main(int argc, char **argv){
         }else if( bSpinner ){
           int nTotal = g.nDb*g.nSql;
           int idx = pSql->seq*g.nDb + pDb->id - 1;
-          printf("\r%s: %d/%d   ", zDbName, idx, nTotal);
+          printf("\r%s: %d/%d            ", zDbName, idx, nTotal);
           fflush(stdout);
         }else if( verboseFlag>1 ){
           printf("%s\n", g.zTestName);
@@ -2560,7 +2581,7 @@ int main(int argc, char **argv){
       /* No progress output */
     }else if( bSpinner ){
       int nTotal = g.nDb*g.nSql;
-      printf("\r%s: %d/%d   \n", zDbName, nTotal, nTotal);
+      printf("\r%s: %d/%d          \n", zDbName, nTotal, nTotal);
     }else if( !quietFlag && verboseFlag<2 ){
       printf(" 100%% - %d tests\n", g.nDb*g.nSql);
     }