diff --git a/manifest b/manifest index e4f301cbb5..129a212ab1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Further\simprovement\sto\sthe\sstatus\sdisplay\sin\stestrunner.tcl.\s\sShow\sthe\nnumber\sof\serrors\sand\sthe\snumber\sof\stest\scases\son\sthe\sstatus\ssummary. -D 2024-08-27T19:28:21.475 +C Further\sminor\simprovements\sand\stweaks\sto\sthe\stestrunner\s--status\sdisplay. +D 2024-08-27T19:49:51.307 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1714,8 +1714,8 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc F test/tester.tcl 2c203a2dd664298f239f0ec3ce22fbc65b5f021c1e09edbae8452af8a694e052 -F test/testrunner.tcl dfb6049b07a44559a2cba909589d56bfe2d9f5ce1828ad3537e350183be3416f -F test/testrunner_data.tcl b281136c9a4a3cb2e6772a87c2e94efad0c12ea3e7d0710521a3cad964f879a1 +F test/testrunner.tcl c27905c57f54450411be922037d227fee65b08928d09715d784380a398b0e758 +F test/testrunner_data.tcl 6a0facfbff26f2f8573ebaeb209426bbb59809d5c0f6925f983bd030ab5248cd F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 @@ -2211,8 +2211,9 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7c0001d6eb43f89144eb84d9e30f575a3feed401d685a0d1f260692e419b2df2 -R 2b16d26e239f800d0fd65b874c223ff3 +P dbc1ac8692feccde271eaca78f2833c8bb7bf620088c8f975692d6ae2c8ba53a 2eaea67495fd9961b7145d829789889bf1d8fa7a834d40d1be43e7c74c233bc2 +R 15868716c90b102057036239341d8066 +T +closed 2eaea67495fd9961b7145d829789889bf1d8fa7a834d40d1be43e7c74c233bc2 U drh -Z 3e4827c72f9a5e7f0a58061fb0e5d912 +Z c190467c6ca0a01405f49df20c5de973 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f88cc1fe3b..bdd3c3e43e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dbc1ac8692feccde271eaca78f2833c8bb7bf620088c8f975692d6ae2c8ba53a +7d1ccc6dfc9abe053baaf39f68e9fb14001f5032a52b85fe1e4b752e48317536 diff --git a/test/testrunner.tcl b/test/testrunner.tcl index bf9e46d934..8d81469c02 100644 --- a/test/testrunner.tcl +++ b/test/testrunner.tcl @@ -421,6 +421,8 @@ proc display_job {jobdict {tm ""}} { if {$tm!=""} { set dtm [expr {$tm-$job(starttime)}] set dtm [format %8s [elapsetime $dtm]] + } else { + set dtm [format %8s ""] } puts " $dfname $dtm" } @@ -472,10 +474,10 @@ proc show_status {db cls} { } else { set clreol "" } - puts [format %-79s "Command line: \[testrunner.tcl$cmdline\]$clreol"] - puts [format %-79s "Cores: $nJob max $S(running) active"] - puts [format %-79s "Summary: [elapsetime $tm], $fin/$total tasks,\ - $ne errors, $nt tests"] + puts [format %-79.79s "Command: \[testrunner.tcl$cmdline\]$clreol"] + puts [format %-79.79s "Cores: $nJob max $S(running) active"] + puts [format %-79.79s "Summary: [elapsetime $tm], $fin/$total tasks,\ + $ne errors, $nt tests"] set srcdir [file dirname [file dirname $TRG(info_script)]] if {$S(running)>0} { @@ -495,7 +497,7 @@ proc show_status {db cls} { } set nOmit [$db one {SELECT count(*) FROM jobs WHERE state='omit'}] if {$nOmit} { - puts "$nOmit jobs omitted due to failures$clreol" + puts [format %-79s "$nOmit jobs omitted due to failures$clreol"] } } if {$cls} { diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl index 5ea03f0c00..48484a3e24 100644 --- a/test/testrunner_data.tcl +++ b/test/testrunner_data.tcl @@ -115,6 +115,7 @@ namespace eval trd { } set build(Stdcall) { -DUSE_STDCALL=1 + -DSQLITE_USE_ONLY_WIN32=1 -O2 }