From: drh <>
Date: Fri, 30 Aug 2024 01:11:19 +0000 (+0000)
Subject: In the testrunner.tcl status report, try to provide a rough estimate of
X-Git-Tag: version-3.47.0~166
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11397ce1048e3ae03b333d7b2428f3fe399ffd12;p=thirdparty%2Fsqlite.git

In the testrunner.tcl status report, try to provide a rough estimate of
the time remaining.

FossilOrigin-Name: 90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f
---

diff --git a/manifest b/manifest
index 7fda0fd8a5..a27e71d2a3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Sync\sthe\sautoconf/Makefile.msc\swith\sthe\smain\s./Makefile.msc
-D 2024-08-29T23:32:16.773
+C In\sthe\stestrunner.tcl\sstatus\sreport,\stry\sto\sprovide\sa\srough\sestimate\sof\nthe\stime\sremaining.
+D 2024-08-30T01:11:19.367
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1714,7 +1714,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052
-F test/testrunner.tcl ff5f42f683a9c868fe01a855d81b9f08e1afb031edc5c340e5cf0fe5deaa0041
+F test/testrunner.tcl 662af46f1f0a41eb197f17583698853dd130ff3d47cf136dd519c3aecd9a9d7d
 F test/testrunner_data.tcl f1cbff53fe42087cac3d43ca02f9574bd212c842307442e2b6fff2183f5ccbfe
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2211,8 +2211,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 854b3776ee1fcaa5931e3a0ed104978ca350d218e553586d1c40c2420e1be498
-R 2925596ad299ac71bd21ba5e19108337
+P 9de47c3611ca05e03a661807a06c6c5c0b5c6548ea7a8d73cb63832d2dff9d0e
+R c902a48c3428870b5b8747f7667d950b
 U drh
-Z afa5bee3192039d82a156b1fe821f6e2
+Z 58e0a7f0d6d1a8c7bc1acf976af98f74
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 915840033d..c360e52b07 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9de47c3611ca05e03a661807a06c6c5c0b5c6548ea7a8d73cb63832d2dff9d0e
+90bc616d20e8c247691c45de2a28d41c1632b21152dc34253eefc179a90ab31f
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 58c718fe47..7ebb173c0c 100644
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -476,13 +476,22 @@ proc show_status {db cls} {
                          $ne errors, $nt tests"]
 
   set srcdir [file dirname [file dirname $TRG(info_script)]]
-  set nrun 0
-  puts [format %-79s    "Running: $S(running) (max: $nJob)"]
+  set line "Running: $S(running) (max: $nJob)"
+  if {$S(running)>0 && $fin>100 && $fin>0.05*$total} {
+    # Only estimate the time remaining after completing at least 100
+    # jobs amounting to 10% of the total.  Never estimate less than
+    # 2% of the total time used so far.
+    set tmleft [expr {($tm/$fin)*($total-$fin)}]
+    if {$tmleft<0.02*$tm} {
+      set tmleft [expr {$tm*0.02}]
+    }
+    append line " est time left [elapsetime $tmleft]"
+  }
+  puts [format %-79.79s $line]
   if {$S(running)>0} {
     $db eval {
       SELECT * FROM jobs WHERE state='running' ORDER BY starttime 
     } job {
-      incr nrun
       display_job [array get job] $now
     }
   }