Fixes for testrunner.tcl on windows.

FossilOrigin-Name: b98e19fc41cb7f89ae9e063b8af414bc01d14833a14de5d646069483ef0127b2

diff --git a/manifest b/manifest
index 0dd6d747f53e51f665ce888cc88aa1d96597192e..7e46bf36d675758d506d0e12dc09a751ceafe2ee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\stestrunner.tcl\srun\svarious\sbuilds\sas\spart\sof\sthe\s'release'\scommand.
-D 2023-02-03T18:47:00.141
+C Fixes\sfor\stestrunner.tcl\son\swindows.
+D 2023-02-03T21:18:58.491
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1402,7 +1402,7 @@ F test/recover.test fd5199f928757cb308661b5fdca1abc19398a798ff7f24b57c3071e9f8e0
 F test/regexp1.test 8f2a8bc1569666e29a4cee6c1a666cd224eb6d50e2470d1dc1df995170f3e0f1
 F test/regexp2.test 55ed41da802b0e284ac7e2fe944be3948f93ff25abbca0361a609acfed1368b5
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
-F test/releasetest_data.tcl 4094c9fc5c9ac544014fa3c66c791bde7d95874b26dd0fd1c058124638ea9001
+F test/releasetest_data.tcl de367fbf4882cf251052b82f40ebf99aa9bc97262c8fec874b00a4f873635740
 F test/resetdb.test 54c06f18bc832ac6d6319e5ab23d5c8dd49fdbeec7c696d791682a8006bd5fc3
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/returning1.test 3ef7b264598b3292be0cdb028e4acb7524c5fd409b33b78449f894dfd68db334
@@ -1565,8 +1565,8 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 8d54d40a55e12554b4509bc12078b201b233c8e842a7543629094a21b1ba956d
-F test/testrunner.tcl 733f7767c0588ad0ced09c75b6a358dd610f0d6d26750be2c5323363bba124d2
-F test/testrunner_data.tcl ec3b2db9f00746b641f2e010bc4e3504f2aff60983d8786a363f66ad40e0483e
+F test/testrunner.tcl bbf75e9eb7d0ff04e875d43c06b15a3e07b17929d59e4fcc9c9de5639b876b9e
+F test/testrunner_data.tcl 8169c68654ac8906833b8a6aadca973358a441ebf88270dd05c153e5f96f76b8
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -2047,8 +2047,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 b2faf9289f6fbbcd4491e1b063da731b35aeed9ff1fc97f64798e99cac847b4a
-R da71c094a7c065812b6c827874cf66e7
+P ba2fae30a81e2574f13a7351c9f843b8c2c7d2c93fcd71fb2de98f5b34f3e109
+R b827d3bd516615bc8be9863017fe4046
 U dan
-Z bc53011b32b3964f996ff997c59940a1
+Z 9af5347e53bdefc802d4137f874271f5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a47ceda038f44e13472bd29b8eebb9ab9605ca38..f797687cb4b12252a36a8ae978edc022d3316e43 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ba2fae30a81e2574f13a7351c9f843b8c2c7d2c93fcd71fb2de98f5b34f3e109
\ No newline at end of file
+b98e19fc41cb7f89ae9e063b8af414bc01d14833a14de5d646069483ef0127b2
\ No newline at end of file

diff --git a/test/releasetest_data.tcl b/test/releasetest_data.tcl
index ef1777999742cd35a30b61632e356d9e00d33653..5529dca12dafadf406c73d132e6e97d10cba5532 100644 (file)
--- a/test/releasetest_data.tcl
+++ b/test/releasetest_data.tcl
@@ -563,8 +563,11 @@ proc main_script {args} {
     puts "make \$1 \"CFLAGS=\$CFLAGS\" \"OPTS=\$OPTS\" $makeOpts"
   } else {
 
+    set srcdir [file nativename [file normalize $srcdir]]
+    # set srcdir [string map [list "\\" "\\\\"] $srcdir]
+
     puts {set TARGET=%1}
-    set makecmd    "nmake /f %SRCDIR%\\Makefile.msc TOP=\"$srcdir\" %TARGET%"
+    set makecmd    "nmake /f $srcdir\\Makefile.msc TOP=\"$srcdir\" %TARGET% "
     append makecmd "\"CFLAGS=$cflags\" \"OPTS=$opts\" $makeOpts"
 
     puts "set TMP=%CD%"

diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 227f1aa9828cd26d0a79c2a9da59e4186978f24d..1d7f412138eaba8bf8385c8b6b230ace7c456148 100644 (file)
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -214,14 +214,17 @@ switch -nocase -glob -- $tcl_platform(os) {
   *darwin* {
     set R(platform) osx
     set R(make)     make.sh
+    set R(makecmd)  "bash make.sh"
   }
   *linux* {
     set R(platform) linux
     set R(make)     make.sh
+    set R(makecmd)  "bash make.sh"
   }
   *win* {
     set R(platform) win
     set R(make)     make.bat
+    set R(makecmd)     make.bat
   }
   default {
     error "cannot determine platform!"
@@ -654,8 +657,9 @@ proc launch_another_job {iJob} {
 
     set     cmd [info nameofexec]
     lappend cmd [file join [file dirname $R(info_script)] releasetest_data.tcl]
-    if {$R(platform)=="win"} { lappend $cmd -msvc }
-    lappend cmd script $b $srcdir
+    lappend cmd script
+    if {$R(platform)=="win"} { lappend cmd -msvc }
+    lappend cmd $b $srcdir
 
     set script [exec {*}$cmd]
     set fd [open [file join $builddir $R(make)] w]
@@ -666,20 +670,20 @@ proc launch_another_job {iJob} {
     set target coretestprogs
     if {$b=="User-Auth"}  { set target testfixture }
 
-    set cmd "bash $R(make) $target"
+    set cmd "$R(makecmd) $target"
     set dir $builddir
 
   } elseif {$c=="make"} {
     set builddir [build_to_dirname $b]
     copy_dir $builddir $dir
-    set cmd "bash $R(make) $f"
+    set cmd "$R(makecmd) $f"
   } else {
     if {$b==""} {
       set testfixture [info nameofexec]
     } else {
-      set testfixture [
-        file normalize [file join [build_to_dirname $b] testfixture]
-      ]
+      set tail testfixture
+      if {$R(platform)=="win"} { set tail testfixture.exe }
+      set testfixture [file normalize [file join [build_to_dirname $b] $tail]]
     }
 
     if {$c=="valgrind"} {

diff --git a/test/testrunner_data.tcl b/test/testrunner_data.tcl
index d846b13ace3f5e97b42d41d3d2ff680eadf2849e..f74ee146caca575bfc7f540f9e92ad7d65d5a28c 100644 (file)
--- a/test/testrunner_data.tcl
+++ b/test/testrunner_data.tcl
@@ -59,11 +59,11 @@ namespace eval trd {
   set extra(osx.Have-Not)                 {fuzztest sourcetest}
   set extra(osx.Locking-Style)            {mptest fuzztest sourcetest}
 
-  # set extra(win.Default)                  mptest
-  # set extra(win.Stdcall)                  {fuzztest sourcetest}
-  # set extra(win.Windows-Memdebug)         {fuzztest sourcetest}
-  # set extra(win.Windows-Win32Heap)        {fuzztest sourcetest}
-  # set extra(win.Have-Not)                 {fuzztest sourcetest}
+  set extra(win.Default)                  mptest
+  set extra(win.Stdcall)                  {fuzztest sourcetest}
+  set extra(win.Windows-Memdebug)         {fuzztest sourcetest}
+  set extra(win.Windows-Win32Heap)        {fuzztest sourcetest}
+  set extra(win.Have-Not)                 {fuzztest sourcetest}
 
   # The following mirrors the set of test suites invoked by "all.test".
   #