Fix another testrunner.tcl problem on windows.

FossilOrigin-Name: 7805844bc4433ae088dae6d54eb972e082c5a3df06e844cfc8b69e7d97aeb432

diff --git a/manifest b/manifest
index ac3fa0c2bdfbfd78763b8dc7b69b37a6c097f8d1..5731f2374ea4715709fa9ffacde426be41a6b9f9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\smissing\sbrace\sproblem\sin\stestrunner.tcl\sintroduced\sby\sthe\sprevious\scommit.
-D 2024-03-11T19:43:43.289
+C Fix\sanother\stestrunner.tcl\sproblem\son\swindows.
+D 2024-03-11T20:34:02.340
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1687,7 +1687,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl fe617b88c7eb08bdf983d2aaa31c20fbf439eee7b8e0d61ca636fcd0c305bbbf
-F test/testrunner.tcl dc2e0d1256292f098f247a0ac33f1ad1be70e3d474bdd064c99b06637b116d3f
+F test/testrunner.tcl 283be0c85bd132136ed564a99227b946194c31a0658df43c22a5e86956b70b43
 F test/testrunner_data.tcl 7ffd951527bbc614e723fd8d123b6834321878530696adecfdf6035100bac64e
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2177,8 +2177,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6eae4547d4d50c798d1f05eaa1da02f4682d261dbd64e94748179923839024e6
-R ffb80cc7c28af1ee50c0fc7e45c14ced
+P 1f5e334d98d98cd90a2fb53502015a883d96fed05c04c1c3e1e78c302bede50f
+R 3329f7728eccdd894e074db61e3ec3e5
 U dan
-Z da9cdae477120048435de0332185ec30
+Z 4fb36ca27e18f07178be9aab3a444f9c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 01d0a91a04a4f016c3f441675a34e380de7240df..cf0788db21fa80822c36136354ef26b39f18ddc9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1f5e334d98d98cd90a2fb53502015a883d96fed05c04c1c3e1e78c302bede50f
\ No newline at end of file
+7805844bc4433ae088dae6d54eb972e082c5a3df06e844cfc8b69e7d97aeb432
\ No newline at end of file

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 170e0457cc3807c1dbb72969589aac49d953dc36..daf7457170e05f7182955b2a18de6f5d5dc43623 100644 (file)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -175,7 +175,7 @@ switch -nocase -glob -- $tcl_platform(os) {
   *win* {
     set TRG(platform)    win
     set TRG(make)        make.bat
-    set TRG(makecmd)     make.bat
+    set TRG(makecmd)     "call make.bat"
     set TRG(testfixture) testfixture.exe
     set TRG(shell)       sqlite3.exe
     set TRG(run)         run.bat
@@ -720,7 +720,7 @@ proc add_shell_build_job {buildname dirname depid} {
 
   if {$TRG(platform)=="win"} {
     set path [string map {/ \\} "$dirname/"]
-    set copycmd "xcopy /S $TRG(shell) $path"
+    set copycmd "xcopy $TRG(shell) $path"
   } else {
     set copycmd "cp $TRG(shell) $dirname/"
   }