From: larrybr <larrybr@noemail.net>
Date: Tue, 10 May 2022 22:32:27 +0000 (+0000)
Subject: Make tester.tcl work on more Windows Tcl installations. And sync w/ trunk.
X-Git-Tag: version-3.39.0~154^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73b7af0437e156d830fdeafdc55b154b4f622735;p=thirdparty%2Fsqlite.git

Make tester.tcl work on more Windows Tcl installations. And sync w/ trunk.

FossilOrigin-Name: d25fbdf8772f1c8283828424b208fc1758c82e9e28e0e52122c87db4af1c672d
---

73b7af0437e156d830fdeafdc55b154b4f622735
diff --cc manifest
index 35a371f782,ca99a17505..d62f6eade2
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Sync\sw/trunk
- D 2022-05-10T06:04:48.349
 -C Fix\sa\sharmless\sUBSAN\swarning.
 -D 2022-05-10T15:55:10.266
++C Make\stester.tcl\swork\son\smore\sWindows\sTcl\sinstallations.\sAnd\ssync\sw/\strunk.
++D 2022-05-10T22:32:27.251
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -553,8 -553,8 +553,8 @@@ F src/printf.c 512574910a45341c8ad244bd
  F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
  F src/resolve.c e9ee235c4151d2b7fa47435a219bfd30bf516a804d2f004639858087ebf3137b
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
- F src/select.c cd17de0cab436f0efc4cfeeeef1b8e03c41c40335ec757eff68e341e6a3f763f
+ F src/select.c 5096a2e8ab0511a413e7f5e45453fea4102d99c5636c46792581ae67899a76d7
 -F src/shell.c.in ae0a6fae983caac6f8c824733f0599dfdf7b3a7e8efdef3cb5e3ab2e457ffc35
 +F src/shell.c.in 0ad33896c3e79a9578c507c8f0589290cbc98b0af1f31ca0cf8ddbb7601e60ef
  F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h f49e28c25bd941e79794db5415fdf7b202deb3bc072ed6f1ed273d578703684e
@@@ -1482,7 -1482,7 +1482,7 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
- F test/tester.tcl f453db5abee4c60e8c3b5c6a87476da1b00ac162e9ab382b779b5dd994fab015
 -F test/tester.tcl 18448c7801d44cc5f2690f54f803da49ed994b3968f73a393cff329e55926679
++F test/tester.tcl 76771269dcc20b2c2d1d6f1175dd50d1eebddc004aebac865483f1829a5cd398
  F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1953,8 -1953,8 +1953,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P cd085b36ff777396ac2705c030c1518f8094a70a0b0ba4a628776429524d20f0 c6c3115f3a008cf9b0d7c5c812f17e38c8a75a904032c5f05f0bea03a7340527
- R 838f188ecf8126e1622bed65965cd48a
 -P c6c3115f3a008cf9b0d7c5c812f17e38c8a75a904032c5f05f0bea03a7340527
 -R 2807b2267081068427cca811153cf146
 -U drh
 -Z ee606463c5289401618f87c78d0ff20c
++P 536691ed0f76ac37f3d86e4f5b1cff15ce4c011f84cd3452b5b45bafb6bf2522 8f9355028bc7baeeb10ee9a5e29f093adac6c2f149596dec0be827be4ce491cb
++R 0ab122ab5f3583cc9eed22372a88908f
 +U larrybr
- Z d5e52d127add2dfe13aa10fbc070c6bb
++Z 110b13c3d969cd3b5747be103d48ee63
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 40da08e124,2383f63a7f..ec555430ea
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 536691ed0f76ac37f3d86e4f5b1cff15ce4c011f84cd3452b5b45bafb6bf2522
 -8f9355028bc7baeeb10ee9a5e29f093adac6c2f149596dec0be827be4ce491cb
++d25fbdf8772f1c8283828424b208fc1758c82e9e28e0e52122c87db4af1c672d
diff --cc test/tester.tcl
index 3407506c74,9d29fdb8df..f651828853
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@@ -184,7 -184,7 +184,7 @@@ proc get_pwd {} 
        set comSpec {C:\Windows\system32\cmd.exe}
      }
      return [string map [list \\ /] \
--        [string trim [exec -- $comSpec /c echo %CD%]]]
++        [string trim [exec -- $comSpec /c CD]]]
    } else {
      return [pwd]
    }