From: stephan <stephan@noemail.net>
Date: Tue, 11 Mar 2025 11:24:52 +0000 (+0000)
Subject: Teach testrunner.tcl to distinguish Cygwin from Windows. This gets it running but... 
X-Git-Tag: major-release~149^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fc7844d40f9c18b74c6105762b28a94dc6f2083;p=thirdparty%2Fsqlite.git

Teach testrunner.tcl to distinguish Cygwin from Windows. This gets it running but then all downstream tests fail, at least in part because of the build target name discrepancies between the platform which requires .exe and those which do not.

FossilOrigin-Name: 2861788e479aea12354f2d34d8e6a2706d193642674ef1f4f852f24c877e0140
---

diff --git a/manifest b/manifest
index 119efea57a..ffb3378cc9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\sinto\sthe\scygwin-fixes\sbranch.
-D 2025-03-10T17:35:00.466
+C Teach\stestrunner.tcl\sto\sdistinguish\sCygwin\sfrom\sWindows.\sThis\sgets\sit\srunning\sbut\sthen\sall\sdownstream\stests\sfail,\sat\sleast\sin\spart\sbecause\sof\sthe\sbuild\starget\sname\sdiscrepancies\sbetween\sthe\splatform\swhich\srequires\s.exe\sand\sthose\swhich\sdo\snot.
+D 2025-03-11T11:24:52.588
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -1730,7 +1730,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 2244752d5dd5135c03370fa09fec3d02c87440521ca600c09c635b1c2cded9ef
-F test/testrunner.tcl 0ffa67806e75aa2c186c63d7d00b16bb45adb91ed6560461fda6dbe3e18c885e x
+F test/testrunner.tcl c876f1ee06c69c9aaf4a1df9e4f288d20f6ae9aa8bb8b7ba73ba909e7e4dee4f x
 F test/testrunner_data.tcl 6d7e7824bb36278ea65c33f7da6dd3ca101fc7d6f7a765b807dce0aa68c52521
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@@ -2213,8 +2213,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8681dfdb59d3258663ec176daafd7a52446a207db21fbd1a4d151508092dcbc5 f418de109335cd7cb29d2b587540c163bbaaa7129c662c2908ef67492139b2d7
-R bee86888a7151d2e80a9568beca57317
+P f3d14433f24f89558e72a9085c950bc72440e9933d6b4ff59d6e603d25e39422
+R 968a0e10f0c24011977fed73e0794469
 U stephan
-Z f13475192cf48b8c4466aedb50a415e2
+Z be3a86ec9d9425377cdfb1a28cbfe62e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index df41f537a0..f8d75d88c9 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f3d14433f24f89558e72a9085c950bc72440e9933d6b4ff59d6e603d25e39422
+2861788e479aea12354f2d34d8e6a2706d193642674ef1f4f852f24c877e0140
diff --git a/test/testrunner.tcl b/test/testrunner.tcl
index 6ff414c4bd..43f05def07 100755
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@@ -263,6 +263,17 @@ switch -nocase -glob -- $tcl_platform(os) {
     set TRG(shell)       sqlite3.exe
     set TRG(run)         run.bat
     set TRG(runcmd)      "run.bat"
+    if {"unix" eq $tcl_platform(platform)} {
+      # Presumably cygwin. This block gets testrunner.tcl started on
+      # Cygwin but then downstream tests all fail, at least in part
+      # because of the discrepancies in build target names which need
+      # .exe on cygwin but not on other Unix-like platforms.
+      set TRG(platform)  cygwin
+      set TRG(make)      make.sh
+      set TRG(makecmd)   "bash make.sh"
+      set TRG(run)       run.sh
+      set TRG(runcmd)    "bash run.sh"
+    }
   }
   default {
     puts "tcl_platform(os)=$::tcl_platform(os)"