Add the -q/--quiet option to test/speedtest.tcl. Automatically enable

-DSQLITE_OMIT_LOAD_EXTENSION and -DSQLITE_THREADSAFE=0 so that no extra
libraries are required.

FossilOrigin-Name: c20d21b473d8a45267262c5df1d7b102eccce8e4cfbe1e467ea66c474aea0af5

diff --git a/manifest b/manifest
index 2ab7b29c5908b3493905fcfdf76334a9c209786e..7b86302386f42646b12cb6a2a3923b9b605aadd3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sdate/time\scomputations\sto\sdeal\swith\sthe\ssub-millisecond\srounding\nproblem\sidentified\sin\s[forum:/forumpost/766a2c9231|forum\spost\s766a2c9231].
-D 2025-01-21T17:37:58.001
+C Add\sthe\s-q/--quiet\soption\sto\stest/speedtest.tcl.\s\sAutomatically\senable\n-DSQLITE_OMIT_LOAD_EXTENSION\sand\s-DSQLITE_THREADSAFE=0\sso\sthat\sno\sextra\nlibraries\sare\srequired.
+D 2025-01-22T17:18:53.134
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -1679,7 +1679,7 @@ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
 F test/speedtest.md e4f467683acfdb2834ca1d6ce209c3d883dfecf73c41f77234b2368be9579de2
-F test/speedtest.tcl 96052cb8c5d44f69e0600e690794557f176ef99bd87cb4360080982d1f479a70 x
+F test/speedtest.tcl 8a9362c1e429318e741b91d26888e7edcc326f98c3aea505ffd618cc5b9e7f0a x
 F test/speedtest1.c 323ce0956430a5aae56ea20f502da7bea3fb62b8ed02e9b0f12ab078b2b258f5
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
@@ -2208,8 +2208,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 7fb1ae25d1572dd7709a0f850c148a5f745a524f01ea231e29a1ebc37c173fb9
-R b5ed3ff5cc6ba0a7bea1d83d8e8c82a9
+P afb0a5923a6db4045fab5226198aab970d746d4866294ebba943c6986e97ecde
+R 9d6f6255d4d3d13ac3e7250fb9209015
 U drh
-Z a3888b28f8eea48eee70a7de9cd84dd2
+Z 359fbb7e57428de2830f61ee25224064
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a04023f095454287ed91dea38f73ce0565f76ae7..ad960cacc62bc568a01bd579104354e863e2a05a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-afb0a5923a6db4045fab5226198aab970d746d4866294ebba943c6986e97ecde
+c20d21b473d8a45267262c5df1d7b102eccce8e4cfbe1e467ea66c474aea0af5

diff --git a/test/speedtest.tcl b/test/speedtest.tcl
index b353077e7c0469f0987afc8993984f7b6f62f16b..93b407c94e61e49f2fedea4add54b4de6cc9fe8d 100755 (executable)
--- a/test/speedtest.tcl
+++ b/test/speedtest.tcl
@@ -26,6 +26,7 @@ Other options include:
    --lean                "Lean" mode.
    --lookaside N SZ      Lookahead uses N slots of SZ bytes each.
    --pagesize N          Use N as the page size.
+   --quiet | -q          "Quite".  Put results in file but don't pop up editor
    --testset TEST        Specify the specific testset to use.  The default
                          is "mix1".  Other options include: "main", "json",
                          "cte", "orm", "fp", "rtree".
@@ -33,10 +34,11 @@ Other options include:
 set srcfile {}
 set outfile {}
 set difffile {}
-set cflags {}
+set cflags {-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_THREADSAFE=0}
 set cc gcc
 set testset mix1
 set dryrun 0
+set quiet 0
 set speedtestflags {--shrink-memory --reprepare --stats --heap 40000000 64}
 lappend speedtestflags --journal wal --size 5
 
@@ -87,6 +89,11 @@ for {set i 0} {$i<[llength $argv]} {incr i} {
         puts $usage
         exit 0
       }
+      -q -
+      -quiet -
+      --quiet {
+        set quiet 1
+      }
       default {
         lappend cflags $arg
       }
@@ -265,7 +272,9 @@ exec size speedtest1 >>$outfile
 #  Processed cachegrind output should now be in the $outfile
 #############################################################################
 
-if {$difffile!=""} {
+if {$quiet} {
+  # Skip this last part of popping up a GUI viewer
+} elseif {$difffile!=""} {
   set fossilcmd {fossil xdiff --tk -c 20}
   lappend fossilcmd $difffile
   lappend fossilcmd $outfile