Updates to testrunner.tcl: Shorten the prefix on created subdirectories from

"testrunner_bld_" to just "testrun_".  Do not append ".exe" to the names of
created subdirectories.  Add the "clean" command to recursively remove all
subdirectories and files created by a test run.

FossilOrigin-Name: 450c7edf1247024db4b66f38bf9561c5c6b0c4175c4df8de17019aea6cbde5cf

diff --git a/Makefile.msc b/Makefile.msc
index 8e06c11cb68ccc5156f8561b1695676a18b932d2..15520148c59f99ee8090e0ac76e18fc679e81d93 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2937,4 +2937,5 @@ clean:
        del /Q fts5.* fts5parse.* 2>NUL
        del /q src-verify.exe 2>NUL
        del /q jimsh.exe jimsh0.exe 2>NUL
+       -$(TCLSH_CMD) test/testrunner.tcl clean
 # <</mark>>

diff --git a/main.mk b/main.mk
index 8cc65403165165a85aff3775c63e1b6ff91183ff..d9546b7c6e256348c71dd38340fe5e655bd3dcf2 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -2505,7 +2505,7 @@ tidy:
 # Removes build products and test logs.  Retains ./configure outputs.
 #
 clean: tidy
-       rm -rf omittest* testrunner* testdir*
+       rm -rf omittest* testrunner* testrun_* testdir*
 
 #
 # Clean up everything.  No exceptions. From an out-of-tree build which

diff --git a/manifest b/manifest
index 9209ad3a5c567d715cfdc6b5d187ea9dea9f7bdf..e54b703b65938036b8ad628d1d97e25bd7d9f8e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,12 +1,12 @@
-C Version\snumber\sto\s3.54.0\sto\sbegin\sthe\snext\sdevelopment\scycle.
-D 2026-04-09T16:03:56.782
+C Updates\sto\stestrunner.tcl:\s\sShorten\sthe\sprefix\son\screated\ssubdirectories\sfrom\n"testrunner_bld_"\sto\sjust\s"testrun_".\s\sDo\snot\sappend\s".exe"\sto\sthe\snames\sof\ncreated\ssubdirectories.\s\sAdd\sthe\s"clean"\scommand\sto\srecursively\sremove\sall\nsubdirectories\sand\sfiles\screated\sby\sa\stest\srun.
+D 2026-04-09T16:08:29.996
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md 6bc480fc673fb4acbc4094e77edb326267dd460162d7723c7f30bee2d3d9e97d
 F Makefile.in 5fda086f33b144da08119255da1d2557f983d0764a13707f05acf0159fd89ba5
 F Makefile.linux-generic bd3e3cacd369821a6241d4ea1967395c962dfe3057e38cb0a435cee0e8b789d0
-F Makefile.msc 92391304cf70f4c178b127aa83b88637abd28d1b83ede451616144037ea1d3dd
+F Makefile.msc 06b757f8648f1d9dd9683dbd72350cf0cf20d6fe09168cac455569b81dd97ddc
 F README.md f49fbd826941842e348242f3ab62f240c985ceafdf8fbe576abf4eb75317468c
 F VERSION 99cf3be5f13d091183e4314b7fc2e0c0e69accfbe64608b45a313338bbdd7b62
 F art/icon-243x273.gif 9750b734f82fdb3dc43127753d5e6fbf3b62c9f4e136c2fbf573b2f57ea87af5
@@ -656,7 +656,7 @@ F ext/wasm/tests/opfs/sahpool/index.html be736567fd92d3ecb9754c145755037cbbd2bca
 F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36e0f6991460fff0cb7c15079454679a4e2
 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk bf77c630aeef4ed4b9270e1fd52c35147b529412c00b74ed6eb8aca3466763f6
+F main.mk 48f6b3557cefd79e5cfae1f15e32d6a0dffd7b689c582a9a7b3920a4ee18affd
 F make.bat a136fd0b1c93e89854a86d5f4edcf0386d211e5d5ec2434480f6eea436c7420c
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1714,7 +1714,7 @@ F test/temptrigfault.tes fc5918e64f3867156fefe7cfca9d8e1f495134a5229b2b511b0dc11
 F test/temptrigger.test a00f258ed8d21a0e8fd4f322f15e8cfb5cef2e43655670e07a753e3fb4769d61
 F test/tester.tcl 2d943f60200e0a36bcd3f1f0baf181a751cd3604ef6b6bd4c8dc39b4e8a53116
 F test/testloadext.c 862b848783eaed9985fbce46c65cd214664376b549fae252b364d5d1ef350a27
-F test/testrunner.tcl 6b232f0d4825dec8b967754503080fc9609fad077f582d02f86bd2d95bec4110 x
+F test/testrunner.tcl 3b6cbceb4d7f0226d51a7fde247cc5592565953568c18155c8c3a454d93bee71 x
 F test/testrunner_data.tcl 48c8a230fcada37f4809f95c2ba49e44bc3d520b6165c09173249c6e65b01cc1
 F test/testrunner_estwork.tcl 81e2ae10238f50540f42fbf2d94913052a99bfb494b69e546506323f195dcff9
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
@@ -2197,8 +2197,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 4525003a53a7fc63ca75c59b22c79608659ca12f0131f52c18637f829977f20b
-R 98475dd41bebbe9ffbbf6d839399a086
+P 4c2a5c9bb40c63bb9d0f633f78d132bdd69b9d755d4e6d5e3cb534e63b383a4e
+R e4d712ce556ffb97f0dc40bbf98f6c34
 U drh
-Z bbcbfabd29e1a5a37b9f01dcc7affa1d
+Z 9ff03cf26c35e2228f544c567c67b650
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index da27f6d383ec860de7592ce9621da7e8029a9d91..31d90ac5aa13427a3cd6a2fbfa004251ba43decd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4c2a5c9bb40c63bb9d0f633f78d132bdd69b9d755d4e6d5e3cb534e63b383a4e
+450c7edf1247024db4b66f38bf9561c5c6b0c4175c4df8de17019aea6cbde5cf

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 62dce8e626e98dcca33f6a7ce5ae6dc788021656..4d1ba57f3885631a5c17f0f21ea51998769adfc2 100755 (executable)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -97,15 +97,16 @@ proc usage {} {
 Usage: 
     $a0 ?SWITCHES? ?PERMUTATION? ?PATTERNS?
     $a0 PERMUTATION FILE
+    $a0 clean
     $a0 errors ?-v|--verbose? ?-s|--summary? ?PATTERN?
+    $a0 estwork
+    $a0 halt
     $a0 help
     $a0 joblist ?PATTERN?
     $a0 njob ?NJOB?
     $a0 retest
     $a0 script ?-msvc? CONFIG
     $a0 status ?-d SECS? ?--cls?
-    $a0 halt
-    $a0 estwork
 
   where SWITCHES are:
     --buildonly              Build test exes but do not run tests
@@ -161,6 +162,12 @@ of the tests.  Use the "-d N" option to have the status display clear the
 screen and repeat every N seconds.  The "njob" command may be used to query
 or modify the number of sub-processes the test script uses to run tests.
 
+The "halt" command modifies the database so that all tasks are marked
+as complete.  Testing will halt when all tests currently running complete.
+
+The "clean" command removes files and directories created by a prior
+invocation of testrunner.tcl.
+
 The "script" command outputs the script used to build a configuration.
 Add the "-msvc" option for a Windows-compatible script. For a list of
 available configurations enter "$a0 script help".
@@ -460,6 +467,32 @@ if {([llength $argv]==2 || [llength $argv]==1)
 }
 #--------------------------------------------------------------------------
 
+#--------------------------------------------------------------------------
+# Check if this is the "clean" command:
+#
+if {([llength $argv]==2 || [llength $argv]==1) 
+ && [string compare -nocase clean [lindex $argv 0]]==0
+} {
+  set pattern {_(fuzzcheck|sessionfuzz|sqlite3|testfixture)}
+  foreach f [glob testrun_*] {
+    if {[file isdir $f] && [regexp $pattern $f]} {
+      file delete -force $f
+    }
+  }
+  foreach f [glob testdir*] {
+    if {[file isdir $f] && [regexp {^testdir[0-9]+$} $f]} {
+      file delete -force $f
+    }
+  }
+  foreach f [glob testrunner.db*] {
+    file delete -force $f
+  }
+  file delete -force testrunner.log
+  exit
+}
+
+#--------------------------------------------------------------------------
+
 #--------------------------------------------------------------------------
 # Check if this is the "halt" command:
 #
@@ -1177,7 +1210,7 @@ proc job_matches_any_pattern {patternlist jobcmd} {
 # 
 # e.g    
 #
-#    {1 /home/user/sqlite/test/testrunner_bld_xyz All-Debug}
+#    {1 /home/user/sqlite/test/testrun_xyz All-Debug}
 # 
 proc add_tcl_jobs {build config patternlist {shelldepid ""}} {
   global TRG
@@ -1243,7 +1276,8 @@ proc add_build_job {buildname target {postcmd ""} {depid ""}} {
   global TRG
 
   set dirname "[string tolower [string map {- _} $buildname]]_$target"
-  set dirname "testrunner_bld_$dirname"
+  regsub {\.exe$} $dirname {} dirname
+  set dirname "testrun_$dirname"
 
   set cmd "$TRG(makecmd) $target"
   if {$postcmd!=""} {