Merge multi-module test logic improvements from trunk.

FossilOrigin-Name: e00a44ac10d68b7bdaff1d9c237b598696eddc2d7392574aee1a95d94b4f165a

diff --cc manifest
index 3a662b37688e721fd6792178f6a2754fd7d70c2c,5c7e84a4897525e196954679acaeb779cb64cc3b..f9a34233fcb6a68d229f183f49481d0387b5bf94
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\strunk\senhancements\sinto\sthe\sautovacuum-pages-callback\sbranch.
- D 2021-10-19T18:00:05.736
 -C Improved\scleanup\sin\sfinish_test\sso\sthat\sspecifying\smultiple\stest\smodules\non\sthe\s"./testfixture"\scommand-line\sis\smore\slikely\sto\swork.
 -D 2021-10-19T18:59:10.277
++C Merge\smulti-module\stest\slogic\simprovements\sfrom\strunk.
++D 2021-10-19T19:26:27.711
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -1930,7 -1929,7 +1930,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P bb6f2b8b486c225043bc64e5f74ff6bbad6c5d1f337f0c81eeb6172b087bb943 03dff7196bb00f8e32f574f65745ceafb33ee3fdd169263121342859c362eca5
- R ea45a0ce3c28a03ec711229b14f24e63
 -P 55b6241871a3b52d835ebdc52a1ce6c736861cf7a03331391c5d6ffd39720514
 -R cc426998f06e87a7bc21c105b31a88c7
++P c26c9e5040ef4c52f2a99597e3a7c3eabd52c905d874fc76ca10fd54b749fa97 3658417bf300e004e5166ee69aa2d8c70697b87ea7456cb6337b0ad6d60257d5
++R cef68242e5282392d1b565c1664937af
  U drh
- Z ee1e455afa1bfa2d6ff7d572ca1b5b4c
 -Z 41e8af220976b65d8b8f69383f67a625
++Z 51c1251fe159b92025649ec2f4e8d588

diff --cc manifest.uuid
index e2dba84613a68a9305614ef0bf9e6e986ca1cf25,e9261140c8885f7a7f963cbd99cb7ae981340ebc..c1ff877a47ed7f73c7d3831b2d9785f386995bef
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c26c9e5040ef4c52f2a99597e3a7c3eabd52c905d874fc76ca10fd54b749fa97
 -3658417bf300e004e5166ee69aa2d8c70697b87ea7456cb6337b0ad6d60257d5
++e00a44ac10d68b7bdaff1d9c237b598696eddc2d7392574aee1a95d94b4f165a